diff --git a/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache b/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache index d4583787564..b2188c12b90 100644 --- a/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache @@ -8,8 +8,8 @@ import Foundation{{#useVapor}} import Vapor{{/useVapor}} {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct APIHelper { - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ import Vapor{{/useVapor}} return destination } - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -33,12 +33,12 @@ import Vapor{{/useVapor}} } } - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -100,7 +100,7 @@ import Vapor{{/useVapor}} /// maps all values from source to query parameters /// /// collection values are always exploded - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/modules/openapi-generator/src/main/resources/swift6/APIs.mustache b/modules/openapi-generator/src/main/resources/swift6/APIs.mustache index ab285c102cf..fe662300e7d 100644 --- a/modules/openapi-generator/src/main/resources/swift6/APIs.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/APIs.mustache @@ -85,7 +85,7 @@ import Alamofire{{/useAlamofire}} {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class RequestBuilder: @unchecked Sendable { {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var credential: URLCredential? {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var headers: [String: String] - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let parameters: [String: Any]? + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let parameters: [String: any Sendable]? {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let method: String {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let URLString: String {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let requestTask: RequestTask = RequestTask() @@ -95,7 +95,7 @@ import Alamofire{{/useAlamofire}} /// Optional block to obtain a reference to the request's progress instance when available. {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var onProgressReady: ((Progress) -> Void)? - required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: {{projectName}}APIConfiguration = {{projectName}}APIConfiguration.shared) { + required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: {{projectName}}APIConfiguration = {{projectName}}APIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters diff --git a/modules/openapi-generator/src/main/resources/swift6/Cartfile.mustache b/modules/openapi-generator/src/main/resources/swift6/Cartfile.mustache index 2a6ed435d5e..f2994b6ac1f 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Cartfile.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Cartfile.mustache @@ -1,5 +1,4 @@ {{#useAlamofire}} -# TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes. -github "Alamofire/Alamofire" = 5.9.1{{/useAlamofire}}{{#usePromiseKit}} +github "Alamofire/Alamofire" = 5.10.2{{/useAlamofire}}{{#usePromiseKit}} github "mxcl/PromiseKit" ~> 8.1{{/usePromiseKit}}{{#useRxSwift}} github "ReactiveX/RxSwift" ~> 6.8{{/useRxSwift}} diff --git a/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache b/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache index 5c10ca73b58..d6315883b2a 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache @@ -11,73 +11,49 @@ import FoundationNetworking @preconcurrency import PromiseKit{{/usePromiseKit}}{{#useVapor}} import Vapor{{/useVapor}}{{^useVapor}} -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -85,24 +61,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } }{{/useVapor}}{{#generateModelAdditionalProperties}} diff --git a/modules/openapi-generator/src/main/resources/swift6/JSONDataEncoding.mustache b/modules/openapi-generator/src/main/resources/swift6/JSONDataEncoding.mustache index bfc766127af..ef6a0611ea8 100644 --- a/modules/openapi-generator/src/main/resources/swift6/JSONDataEncoding.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/JSONDataEncoding.mustache @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct JSONDataEncoding { +{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ import FoundationNetworking /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ import FoundationNetworking return urlRequest } - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/modules/openapi-generator/src/main/resources/swift6/JSONEncodingHelper.mustache b/modules/openapi-generator/src/main/resources/swift6/JSONEncodingHelper.mustache index 5a0cebbc7e4..d3045ec1edc 100644 --- a/modules/openapi-generator/src/main/resources/swift6/JSONEncodingHelper.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/JSONEncodingHelper.mustache @@ -9,8 +9,8 @@ import Foundation {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class JSONEncodingHelper { - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ import Foundation return params } - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/modules/openapi-generator/src/main/resources/swift6/Models.mustache b/modules/openapi-generator/src/main/resources/swift6/Models.mustache index 48d37fa6247..14b236ee221 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Models.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Models.mustache @@ -10,8 +10,8 @@ import FoundationNetworking #endif{{#useAlamofire}} import Alamofire{{/useAlamofire}} -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. @@ -119,9 +119,9 @@ extension Response : Sendable where T : Sendable {}{{#useAlamofire}} /// Type-erased ResponseSerializer /// /// This is needed in order to use `ResponseSerializer` as a Type in `Configuration`. Obsolete with `any` keyword in Swift >= 5.7 -{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct AnyResponseSerializer: ResponseSerializer { +{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct AnyResponseSerializer: ResponseSerializer { - let _serialize: (URLRequest?, HTTPURLResponse?, Data?, Error?) throws -> T + let _serialize: @Sendable (URLRequest?, HTTPURLResponse?, Data?, Error?) throws -> T {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(_ delegatee: V) where V.SerializedObject == T { _serialize = delegatee.serialize diff --git a/modules/openapi-generator/src/main/resources/swift6/OpenAPIDateWithoutTime.mustache b/modules/openapi-generator/src/main/resources/swift6/OpenAPIDateWithoutTime.mustache index c7ef054e525..aee5bf79010 100644 --- a/modules/openapi-generator/src/main/resources/swift6/OpenAPIDateWithoutTime.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/OpenAPIDateWithoutTime.mustache @@ -76,8 +76,8 @@ import Foundation } } -extension OpenAPIDateWithoutTime: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension OpenAPIDateWithoutTime: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return OpenISO8601DateFormatter.withoutTime.string(from: self.normalizedWrappedDate()) } } diff --git a/modules/openapi-generator/src/main/resources/swift6/Package.swift.mustache b/modules/openapi-generator/src/main/resources/swift6/Package.swift.mustache index 811037e7536..f4b4f677e59 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Package.swift.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Package.swift.mustache @@ -25,8 +25,7 @@ let package = Package( dependencies: [ // Dependencies declare other packages that this package depends on. {{#useAlamofire}} - // TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes. - .package(url: "https://github.com/Alamofire/Alamofire", exact: "5.9.1"), + .package(url: "https://github.com/Alamofire/Alamofire", exact: "5.10.2"), {{/useAlamofire}} {{#usePromiseKit}} .package(url: "https://github.com/mxcl/PromiseKit", .upToNextMajor(from: "8.1.2")), diff --git a/modules/openapi-generator/src/main/resources/swift6/Podspec.mustache b/modules/openapi-generator/src/main/resources/swift6/Podspec.mustache index 32f732d04c2..341fd45b1c3 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Podspec.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Podspec.mustache @@ -27,8 +27,7 @@ Pod::Spec.new do |s| {{/podDocumentationURL}} s.source_files = '{{swiftPackagePath}}{{^swiftPackagePath}}{{#useSPMFileStructure}}Sources/{{projectName}}{{/useSPMFileStructure}}{{^useSPMFileStructure}}{{projectName}}/Classes{{/useSPMFileStructure}}{{/swiftPackagePath}}/**/*.swift' {{#useAlamofire}} - # TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes. - s.dependency 'Alamofire', '5.9.1' + s.dependency 'Alamofire', '5.10.2' {{/useAlamofire}} {{#usePromiseKit}} s.dependency 'PromiseKit/CorePromise', '~> 8.1' diff --git a/modules/openapi-generator/src/main/resources/swift6/_param.mustache b/modules/openapi-generator/src/main/resources/swift6/_param.mustache index 5b88c05ef6d..bdadb82c623 100644 --- a/modules/openapi-generator/src/main/resources/swift6/_param.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/_param.mustache @@ -1 +1 @@ -"{{baseName}}": {{#isQueryParam}}(wrappedValue: {{/isQueryParam}}{{paramName}}{{^required}}?{{/required}}.encodeToJSON(codableHelper: apiConfiguration.codableHelper){{#isQueryParam}}, isExplode: {{isExplode}}){{/isQueryParam}} \ No newline at end of file +"{{baseName}}": {{#isQueryParam}}(wrappedValue: {{/isQueryParam}}{{paramName}}{{^required}}?{{/required}}.encodeToQueryString(codableHelper: apiConfiguration.codableHelper){{#isQueryParam}}, isExplode: {{isExplode}}){{/isQueryParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/swift6/api.mustache b/modules/openapi-generator/src/main/resources/swift6/api.mustache index 8bd2521a1d4..a4728dbfb84 100644 --- a/modules/openapi-generator/src/main/resources/swift6/api.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/api.mustache @@ -295,7 +295,7 @@ extension {{projectName}}API { {{/bodyParam}} {{^bodyParam}} {{#hasFormParams}} - let localVariableFormParams: [String: Any?] = [ + let localVariableFormParams: [String: (any Sendable)?] = [ {{#formParams}} {{> _param}}, {{/formParams}} @@ -305,7 +305,7 @@ extension {{projectName}}API { let localVariableParameters = APIHelper.convertBoolToString(localVariableNonNullParameters) {{/hasFormParams}} {{^hasFormParams}} - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil {{/hasFormParams}} {{/bodyParam}}{{#hasQueryParams}} var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -316,7 +316,7 @@ extension {{projectName}}API { ]){{/hasQueryParams}}{{^hasQueryParams}} let localVariableUrlComponents = URLComponents(string: localVariableURLString){{/hasQueryParams}} - let localVariableNillableHeaders: [String: Any?] = [{{^headerParams}}{{^hasFormParams}}{{^hasConsumes}} + let localVariableNillableHeaders: [String: (any Sendable)?] = [{{^headerParams}}{{^hasFormParams}}{{^hasConsumes}} :{{/hasConsumes}}{{/hasFormParams}}{{/headerParams}}{{#hasFormParams}} "Content-Type": {{^consumes}}"multipart/form-data"{{/consumes}}{{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}},{{/hasFormParams}}{{^hasFormParams}}{{#hasConsumes}} "Content-Type": {{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}},{{/hasConsumes}}{{/hasFormParams}}{{#headerParams}} diff --git a/modules/openapi-generator/src/main/resources/swift6/libraries/alamofire/AlamofireImplementations.mustache b/modules/openapi-generator/src/main/resources/swift6/libraries/alamofire/AlamofireImplementations.mustache index eadc9194823..f2db4445678 100644 --- a/modules/openapi-generator/src/main/resources/swift6/libraries/alamofire/AlamofireImplementations.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/libraries/alamofire/AlamofireImplementations.mustache @@ -28,7 +28,7 @@ fileprivate class AlamofireRequestBuilderConfiguration: @unchecked Sendable { } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class AlamofireRequestBuilder: RequestBuilder, @unchecked Sendable { - required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: {{projectName}}APIConfiguration = {{projectName}}APIConfiguration.shared) { + required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: {{projectName}}APIConfiguration = {{projectName}}APIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -86,7 +86,7 @@ fileprivate class AlamofireRequestBuilderConfiguration: @unchecked Sendable { } @discardableResult - override {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func execute(completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) -> RequestTask { + override {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func execute(completion: @Sendable @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) -> RequestTask { let managerId = UUID().uuidString // Create a new manager for each request to customize its request header let manager = createAlamofireSession() @@ -163,12 +163,12 @@ fileprivate class AlamofireRequestBuilderConfiguration: @unchecked Sendable { return requestTask } - fileprivate func processRequest(request: DataRequest, managerId: String, completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { + fileprivate func processRequest(request: DataRequest, managerId: String, completion: @Sendable @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { if let credential = self.credential { request.authenticate(with: credential) } - let cleanupRequest = { + let cleanupRequest = { @Sendable in AlamofireRequestBuilderConfiguration.shared.managerStore[managerId] = nil } @@ -257,12 +257,12 @@ fileprivate class AlamofireRequestBuilderConfiguration: @unchecked Sendable { {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class AlamofireDecodableRequestBuilder: AlamofireRequestBuilder, @unchecked Sendable { - override fileprivate func processRequest(request: DataRequest, managerId: String, completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { + override fileprivate func processRequest(request: DataRequest, managerId: String, completion: @Sendable @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { if let credential = self.credential { request.authenticate(with: credential) } - let cleanupRequest = { + let cleanupRequest = { @Sendable in AlamofireRequestBuilderConfiguration.shared.managerStore[managerId] = nil } @@ -415,6 +415,6 @@ extension JSONDataEncoding: ParameterEncoding { public func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest { let urlRequest = try urlRequest.asURLRequest() - return encode(urlRequest, with: parameters) + return encode(request: urlRequest, with: parameters) } } diff --git a/modules/openapi-generator/src/main/resources/swift6/libraries/urlsession/URLSessionImplementations.mustache b/modules/openapi-generator/src/main/resources/swift6/libraries/urlsession/URLSessionImplementations.mustache index 94fde0e7e58..af45cadbeb5 100644 --- a/modules/openapi-generator/src/main/resources/swift6/libraries/urlsession/URLSessionImplementations.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/libraries/urlsession/URLSessionImplementations.mustache @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: {{projectName}}APIConfiguration = {{projectName}}APIConfiguration.shared) { + required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: {{projectName}}APIConfiguration = {{projectName}}APIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ fileprivate final class SessionDelegate: NSObject, URLSessionTaskDelegate { } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/modules/openapi-generator/src/main/resources/swift6/modelEnum.mustache b/modules/openapi-generator/src/main/resources/swift6/modelEnum.mustache index d52e92f46a6..9f5d5426dd9 100644 --- a/modules/openapi-generator/src/main/resources/swift6/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/modelEnum.mustache @@ -1,4 +1,4 @@ -{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{dataType}}, Sendable, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}, JSONEncodable{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{/enumUnknownDefaultCase}} { +{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{dataType}}, Sendable, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}, QueryStringEncodable{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{/enumUnknownDefaultCase}} { {{#allowableValues}} {{#enumVars}} case {{{name}}} = {{{value}}} diff --git a/modules/openapi-generator/src/main/resources/swift6/modelInlineEnumDeclaration.mustache b/modules/openapi-generator/src/main/resources/swift6/modelInlineEnumDeclaration.mustache index bc12324480b..206b8494cea 100644 --- a/modules/openapi-generator/src/main/resources/swift6/modelInlineEnumDeclaration.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/modelInlineEnumDeclaration.mustache @@ -1,4 +1,4 @@ - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{enumName}}: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}, Sendable, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isContainer}}{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}, JSONEncodable{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/isContainer}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{#isContainer}}, CaseIterableDefaultsLast{{/isContainer}}{{/enumUnknownDefaultCase}} { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{enumName}}: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}, Sendable, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isContainer}}{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}, QueryStringEncodable{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/isContainer}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{#isContainer}}, CaseIterableDefaultsLast{{/isContainer}}{{/enumUnknownDefaultCase}} { {{#allowableValues}} {{#enumVars}} case {{{name}}} = {{{value}}} diff --git a/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache index fa2f3c7c32d..52da0f11189 100644 --- a/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache @@ -1,5 +1,5 @@ -{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}: {{^useClasses}}Sendable, {{/useClasses}}{{#useClasses}}{{#readonlyProperties}}@unchecked Sendable, {{/readonlyProperties}}{{/useClasses}}{{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{#useJsonEncodable}}, JSONEncodable{{/useJsonEncodable}}{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} { -{{/objcCompatible}}{{#objcCompatible}}@objcMembers {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable{{#useJsonEncodable}}, JSONEncodable{{/useJsonEncodable}} { +{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}: {{^useClasses}}Sendable, {{/useClasses}}{{#useClasses}}{{#readonlyProperties}}@unchecked Sendable, {{/readonlyProperties}}{{/useClasses}}{{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{#useJsonEncodable}}, QueryStringEncodable{{/useJsonEncodable}}{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} { +{{/objcCompatible}}{{#objcCompatible}}@objcMembers {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable{{#useJsonEncodable}}, QueryStringEncodable{{/useJsonEncodable}} { {{/objcCompatible}} {{#allVars}} diff --git a/modules/openapi-generator/src/main/resources/swift6/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/swift6/modelOneOf.mustache index 8df0b3ebb98..b36e5f68202 100644 --- a/modules/openapi-generator/src/main/resources/swift6/modelOneOf.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/modelOneOf.mustache @@ -1,4 +1,4 @@ -{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{^useClasses}}Sendable, {{/useClasses}}{{#useClasses}}{{#readonlyProperties}}Sendable, {{/readonlyProperties}}{{/useClasses}}{{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable, JSONEncodable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{/useVapor}} { +{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{^useClasses}}Sendable, {{/useClasses}}{{#useClasses}}{{#readonlyProperties}}Sendable, {{/readonlyProperties}}{{/useClasses}}{{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable, QueryStringEncodable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{/useVapor}} { {{#oneOf}} case type{{#transformArrayType}}{{.}}{{/transformArrayType}}({{.}}) {{/oneOf}} diff --git a/samples/client/petstore/swift6/alamofireLibrary/Cartfile b/samples/client/petstore/swift6/alamofireLibrary/Cartfile index 37690feb8b3..329bb9d3ee0 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Cartfile +++ b/samples/client/petstore/swift6/alamofireLibrary/Cartfile @@ -1,2 +1 @@ -# TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes. -github "Alamofire/Alamofire" = 5.9.1 +github "Alamofire/Alamofire" = 5.10.2 diff --git a/samples/client/petstore/swift6/alamofireLibrary/Package.resolved b/samples/client/petstore/swift6/alamofireLibrary/Package.resolved index 423182cd681..453c28932a6 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Package.resolved +++ b/samples/client/petstore/swift6/alamofireLibrary/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "82fa799fdb0b54d09f6eef7da70838721a3b0d69ea8499c89924e55e07e47110", + "originHash" : "d2e45fa99287c9c1d71d047aa90c9675d5c0aee0e8ba334a9517cdbbfc12f90f", "pins" : [ { "identity" : "alamofire", "kind" : "remoteSourceControl", "location" : "https://github.com/Alamofire/Alamofire", "state" : { - "revision" : "f455c2975872ccd2d9c81594c658af65716e9b9a", - "version" : "5.9.1" + "revision" : "513364f870f6bfc468f9d2ff0a95caccc10044c5", + "version" : "5.10.2" } } ], diff --git a/samples/client/petstore/swift6/alamofireLibrary/Package.swift b/samples/client/petstore/swift6/alamofireLibrary/Package.swift index 96a56d49ac0..b4c5244b2a4 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Package.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Package.swift @@ -19,8 +19,7 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - // TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes. - .package(url: "https://github.com/Alamofire/Alamofire", exact: "5.9.1"), + .package(url: "https://github.com/Alamofire/Alamofire", exact: "5.10.2"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec index 42982ae8f38..64d4ba09943 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec +++ b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec @@ -11,6 +11,5 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/openapitools/openapi-generator' s.summary = 'PetstoreClient' s.source_files = 'Sources/PetstoreClient/**/*.swift' - # TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes. - s.dependency 'Alamofire', '5.9.1' + s.dependency 'Alamofire', '5.10.2' end diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift index 9f26e85a1f6..35a364fe3d6 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift @@ -43,7 +43,7 @@ open class AnotherFakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift index c65b7cceabf..4970cec8d0c 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift @@ -41,7 +41,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -84,7 +84,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -127,7 +127,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -170,7 +170,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -213,7 +213,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -257,10 +257,10 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "query": (wrappedValue: query.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "query": (wrappedValue: query.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -305,7 +305,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -375,21 +375,21 @@ open class FakeAPI { open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: OpenAPIDateWithoutTime? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "integer": integer?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int32": int32?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int64": int64?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "number": number.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "float": float?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "double": double.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "string": string?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "pattern_without_delimiter": patternWithoutDelimiter.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "byte": byte.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "binary": binary?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "date": date?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "dateTime": dateTime?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "password": password?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "callback": callback?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "integer": integer?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int32": int32?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int64": int64?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "number": number.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "float": float?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "double": double.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "string": string?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "pattern_without_delimiter": patternWithoutDelimiter.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "byte": byte.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "binary": binary?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "date": date?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "dateTime": dateTime?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "password": password?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "callback": callback?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -397,7 +397,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -519,9 +519,9 @@ open class FakeAPI { open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "enum_form_string_array": enumFormStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_form_string": enumFormString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "enum_form_string_array": enumFormStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_form_string": enumFormString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -529,16 +529,16 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_string": (wrappedValue: enumQueryString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string": (wrappedValue: enumQueryString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", - "enum_header_string_array": enumHeaderStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_header_string": enumHeaderString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "enum_header_string_array": enumHeaderStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_header_string": enumHeaderString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -588,19 +588,19 @@ open class FakeAPI { open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "required_string_group": (wrappedValue: requiredStringGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "required_int64_group": (wrappedValue: requiredInt64Group.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "string_group": (wrappedValue: stringGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "int64_group": (wrappedValue: int64Group?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_string_group": (wrappedValue: requiredStringGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_int64_group": (wrappedValue: requiredInt64Group.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "string_group": (wrappedValue: stringGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "int64_group": (wrappedValue: int64Group?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ - "required_boolean_group": requiredBooleanGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "boolean_group": booleanGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "required_boolean_group": requiredBooleanGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "boolean_group": booleanGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -643,7 +643,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -685,9 +685,9 @@ open class FakeAPI { open class func testJsonFormDataWithRequestBuilder(param: String, param2: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "param": param.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "param2": param2.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "param": param.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "param2": param2.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -695,7 +695,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift index ea006b9ea66..ac5f4f31245 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift @@ -46,7 +46,7 @@ open class FakeClassnameTags123API { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/PetAPI.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/PetAPI.swift index 381dba4b9a8..32397a81b62 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/PetAPI.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/PetAPI.swift @@ -48,7 +48,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -96,12 +96,12 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ - "api_key": apiKey?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "api_key": apiKey?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -153,14 +153,14 @@ open class PetAPI { open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "status": (wrappedValue: status.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "status": (wrappedValue: status.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -206,14 +206,14 @@ open class PetAPI { open class func findPetsByTagsWithRequestBuilder(tags: [String], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "tags": (wrappedValue: tags.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "tags": (wrappedValue: tags.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -260,11 +260,11 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -311,7 +311,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -361,9 +361,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "name": name?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "status": status?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "name": name?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "status": status?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -371,7 +371,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -421,9 +421,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "file": file?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "file": file?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -431,7 +431,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] @@ -481,9 +481,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "requiredFile": requiredFile.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "requiredFile": requiredFile.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -491,7 +491,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift index 978d4ab3532..869095e68a8 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift @@ -42,11 +42,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -88,11 +88,11 @@ open class StoreAPI { open class func getInventoryWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -136,11 +136,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -184,7 +184,7 @@ open class StoreAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/UserAPI.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/UserAPI.swift index b7688269a31..d9e47ad7fb4 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/UserAPI.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/UserAPI.swift @@ -43,7 +43,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -87,7 +87,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -131,7 +131,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -175,11 +175,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -222,11 +222,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -269,15 +269,15 @@ open class UserAPI { open class func loginUserWithRequestBuilder(username: String, password: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/login" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "username": (wrappedValue: username.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "password": (wrappedValue: password.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "username": (wrappedValue: username.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "password": (wrappedValue: password.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -315,11 +315,11 @@ open class UserAPI { open class func logoutUserWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/logout" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -369,7 +369,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift index 7a3c5d2d375..31754be3809 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift @@ -64,7 +64,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -74,7 +74,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift index b9ec99239b6..6ab188305e2 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift @@ -28,7 +28,7 @@ fileprivate class AlamofireRequestBuilderConfiguration: @unchecked Sendable { } open class AlamofireRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -86,7 +86,7 @@ open class AlamofireRequestBuilder: RequestBuilder, @unchecked Sendable { } @discardableResult - override open func execute(completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) -> RequestTask { + override open func execute(completion: @Sendable @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) -> RequestTask { let managerId = UUID().uuidString // Create a new manager for each request to customize its request header let manager = createAlamofireSession() @@ -163,12 +163,12 @@ open class AlamofireRequestBuilder: RequestBuilder, @unchecked Sendable { return requestTask } - fileprivate func processRequest(request: DataRequest, managerId: String, completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { + fileprivate func processRequest(request: DataRequest, managerId: String, completion: @Sendable @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { if let credential = self.credential { request.authenticate(with: credential) } - let cleanupRequest = { + let cleanupRequest = { @Sendable in AlamofireRequestBuilderConfiguration.shared.managerStore[managerId] = nil } @@ -257,12 +257,12 @@ open class AlamofireRequestBuilder: RequestBuilder, @unchecked Sendable { open class AlamofireDecodableRequestBuilder: AlamofireRequestBuilder, @unchecked Sendable { - override fileprivate func processRequest(request: DataRequest, managerId: String, completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { + override fileprivate func processRequest(request: DataRequest, managerId: String, completion: @Sendable @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { if let credential = self.credential { request.authenticate(with: credential) } - let cleanupRequest = { + let cleanupRequest = { @Sendable in AlamofireRequestBuilderConfiguration.shared.managerStore[managerId] = nil } @@ -415,6 +415,6 @@ extension JSONDataEncoding: ParameterEncoding { public func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest { let urlRequest = try urlRequest.asURLRequest() - return encode(urlRequest, with: parameters) + return encode(request: urlRequest, with: parameters) } } 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 b4341b60870..7dd50aa2e70 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -9,73 +9,49 @@ import Foundation import FoundationNetworking #endif -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -83,24 +59,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Models.swift index 9f52fd5393e..9414c8dfaeb 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Models.swift @@ -10,8 +10,8 @@ import FoundationNetworking #endif import Alamofire -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. @@ -119,9 +119,9 @@ extension Response : Sendable where T : Sendable {} /// Type-erased ResponseSerializer /// /// This is needed in order to use `ResponseSerializer` as a Type in `Configuration`. Obsolete with `any` keyword in Swift >= 5.7 -public struct AnyResponseSerializer: ResponseSerializer { +public struct AnyResponseSerializer: ResponseSerializer { - let _serialize: (URLRequest?, HTTPURLResponse?, Data?, Error?) throws -> T + let _serialize: @Sendable (URLRequest?, HTTPURLResponse?, Data?, Error?) throws -> T public init(_ delegatee: V) where V.SerializedObject == T { _serialize = delegatee.serialize diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/OpenAPIDateWithoutTime.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/OpenAPIDateWithoutTime.swift index ea3b51bf3eb..8b0af6a53ec 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/OpenAPIDateWithoutTime.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/OpenAPIDateWithoutTime.swift @@ -76,8 +76,8 @@ public struct OpenAPIDateWithoutTime: Sendable, Codable, Hashable, Equatable { } } -extension OpenAPIDateWithoutTime: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension OpenAPIDateWithoutTime: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return OpenISO8601DateFormatter.withoutTime.string(from: self.normalizedWrappedDate()) } } diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift index ca940fd8662..9bd081f7d00 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var mapString: [String: String]? public var mapMapString: [String: [String: String]]? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Animal.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Animal.swift index c8a6f210c55..b20104e0503 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Animal.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Animal.swift @@ -7,7 +7,7 @@ import Foundation -public struct Animal: Sendable, Codable, JSONEncodable, Hashable { +public struct Animal: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ApiResponse.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ApiResponse.swift index a8d7a4a1423..cea25ea52e2 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ApiResponse.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ApiResponse.swift @@ -7,7 +7,7 @@ import Foundation -public struct ApiResponse: Sendable, Codable, JSONEncodable, Hashable { +public struct ApiResponse: Sendable, Codable, QueryStringEncodable, Hashable { public var code: Int? public var type: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift index e569ab1877e..679279d61cb 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayArrayNumber: [[Double]]? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift index 2dd67b1cb58..d71bd4e40b7 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayNumber: [Double]? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayTest.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayTest.swift index 21943123d9e..839795229bb 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayTest.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayTest: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayTest: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayOfString: [String]? public var arrayArrayOfInteger: [[Int64]]? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Capitalization.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Capitalization.swift index 55de9b34a29..56100523e84 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Capitalization.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Capitalization.swift @@ -7,7 +7,7 @@ import Foundation -public struct Capitalization: Sendable, Codable, JSONEncodable, Hashable { +public struct Capitalization: Sendable, Codable, QueryStringEncodable, Hashable { public var smallCamel: String? public var capitalCamel: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Cat.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Cat.swift index 80ff359c186..cceeddd1bf9 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Cat.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Cat.swift @@ -7,7 +7,7 @@ import Foundation -public struct Cat: Sendable, Codable, JSONEncodable, Hashable { +public struct Cat: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift index d1cceeccfe8..c04a9e673cf 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift @@ -7,7 +7,7 @@ import Foundation -public struct Category: Sendable, Codable, JSONEncodable, Hashable { +public struct Category: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? = "default-name" diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ClassModel.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ClassModel.swift index 45546a7b33f..4c1e9c1a990 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ClassModel.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ClassModel.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model with \"_class\" property */ -public struct ClassModel: Sendable, Codable, JSONEncodable, Hashable { +public struct ClassModel: Sendable, Codable, QueryStringEncodable, Hashable { public var _class: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Client.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Client.swift index e6792283509..b49ded4cc5c 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Client.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Client.swift @@ -7,7 +7,7 @@ import Foundation -public struct Client: Sendable, Codable, JSONEncodable, Hashable { +public struct Client: Sendable, Codable, QueryStringEncodable, Hashable { public var client: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Dog.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Dog.swift index 9cb18da8a57..99231ca03f7 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Dog.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Dog.swift @@ -7,7 +7,7 @@ import Foundation -public struct Dog: Sendable, Codable, JSONEncodable, Hashable { +public struct Dog: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumArrays.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumArrays.swift index a8f557dfc8e..09bbcb9f280 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumArrays.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumArrays.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumArrays: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumArrays: Sendable, Codable, QueryStringEncodable, Hashable { public enum JustSymbol: String, Sendable, Codable, CaseIterable { case greaterThanOrEqualTo = ">=" diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumTest.swift index 298f93c69bd..d280112e88b 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumTest: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum EnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/File.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/File.swift index 989bc5d0837..c35e1b2d53a 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/File.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/File.swift @@ -8,7 +8,7 @@ import Foundation /** Must be named `File` for test. */ -public struct File: Sendable, Codable, JSONEncodable, Hashable { +public struct File: Sendable, Codable, QueryStringEncodable, Hashable { /** Test capitalization */ public var sourceURI: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift index 4e7e54f8ca2..6ca430a91ba 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct FileSchemaTestClass: Sendable, Codable, JSONEncodable, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, QueryStringEncodable, Hashable { public var file: File? public var files: [File]? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FormatTest.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FormatTest.swift index 3d80f272cc8..c39b80d4145 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FormatTest.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FormatTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct FormatTest: Sendable, Codable, JSONEncodable, Hashable { +public struct FormatTest: Sendable, Codable, QueryStringEncodable, Hashable { public static let integerRule = NumericRule(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil) public static let int32Rule = NumericRule(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil) diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift index 15c2cd2feee..e5db6255169 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct HasOnlyReadOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var foo: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/List.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/List.swift index a35819ac5ee..75c553df8fc 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/List.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/List.swift @@ -7,7 +7,7 @@ import Foundation -public struct List: Sendable, Codable, JSONEncodable, Hashable { +public struct List: Sendable, Codable, QueryStringEncodable, Hashable { public var _123list: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MapTest.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MapTest.swift index be8a35e8fcc..8cc06717f31 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MapTest.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MapTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct MapTest: Sendable, Codable, JSONEncodable, Hashable { +public struct MapTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum MapOfEnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift index 58d90fe83c5..2c7bd6d9c7c 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var uuid: UUID? public var dateTime: Date? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Model200Response.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Model200Response.swift index 550840b8a4c..dfe19e3fdd9 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Model200Response.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Model200Response.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name starting with number */ -public struct Model200Response: Sendable, Codable, JSONEncodable, Hashable { +public struct Model200Response: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int? public var _class: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Name.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Name.swift index b72dd32ecba..d0a98e0980b 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Name.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Name.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name same as property name */ -public struct Name: Sendable, Codable, JSONEncodable, Hashable { +public struct Name: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int public var snakeCase: NullEncodable = .encodeValue(11033) diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/NumberOnly.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/NumberOnly.swift index f2a25b6f0d2..47d2e318bb5 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/NumberOnly.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/NumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct NumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct NumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var justNumber: Double? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift index 9bc6ecf183e..6a9ecc5540c 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift @@ -7,7 +7,7 @@ import Foundation -public struct Order: Sendable, Codable, JSONEncodable, Hashable { +public struct Order: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case placed = "placed" diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterComposite.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterComposite.swift index 9d8a17c8fd2..0a4d002a2dd 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterComposite.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterComposite.swift @@ -7,7 +7,7 @@ import Foundation -public struct OuterComposite: Sendable, Codable, JSONEncodable, Hashable { +public struct OuterComposite: Sendable, Codable, QueryStringEncodable, Hashable { public var myNumber: Double? public var myString: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift index b1ccb862d1a..302a3052c6e 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift @@ -7,7 +7,7 @@ import Foundation -public struct Pet: Sendable, Codable, JSONEncodable, Hashable { +public struct Pet: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case available = "available" diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift index 5c98c4b1fef..5a06da436f6 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift @@ -7,7 +7,7 @@ import Foundation -public struct ReadOnlyFirst: Sendable, Codable, JSONEncodable, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var baz: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Return.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Return.swift index 261d6d690b8..53ca3f5ad7f 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Return.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Return.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing reserved words */ -public struct Return: Sendable, Codable, JSONEncodable, Hashable { +public struct Return: Sendable, Codable, QueryStringEncodable, Hashable { public var _return: Int? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift index d566fc2b6eb..40ad8ff0a05 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift @@ -7,7 +7,7 @@ import Foundation -public struct SpecialModelName: Sendable, Codable, JSONEncodable, Hashable { +public struct SpecialModelName: Sendable, Codable, QueryStringEncodable, Hashable { public var specialPropertyName: Int64? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift index 847f1e87afd..3bbade9feb7 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift @@ -7,7 +7,7 @@ import Foundation -public struct StringBooleanMap: Sendable, Codable, JSONEncodable, Hashable { +public struct StringBooleanMap: Sendable, Codable, QueryStringEncodable, Hashable { public enum CodingKeys: CodingKey, CaseIterable { diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift index 514e6abfcee..7c19767a11f 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift @@ -7,7 +7,7 @@ import Foundation -public struct Tag: Sendable, Codable, JSONEncodable, Hashable { +public struct Tag: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift index a3fa21d8cb5..eaaab729500 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderDefault: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderDefault: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String = "what" public var numberItem: Double diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift index 6102e9a3726..bac80c4fcd2 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderExample: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderExample: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String public var numberItem: Double diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift index ecdde64a8d1..e41975d4d66 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift @@ -7,7 +7,7 @@ import Foundation -public struct User: Sendable, Codable, JSONEncodable, Hashable { +public struct User: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/alamofireLibrary/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/swiftpm/Package.resolved b/samples/client/petstore/swift6/alamofireLibrary/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6a8f55be4c4..453c28932a6 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/samples/client/petstore/swift6/alamofireLibrary/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "6fb5b6bfc406365339fcc9d8236adab4f0b7ee38fc666a0f00b4b3b75beb7900", + "originHash" : "d2e45fa99287c9c1d71d047aa90c9675d5c0aee0e8ba334a9517cdbbfc12f90f", "pins" : [ { "identity" : "alamofire", "kind" : "remoteSourceControl", "location" : "https://github.com/Alamofire/Alamofire", "state" : { - "revision" : "f455c2975872ccd2d9c81594c658af65716e9b9a", - "version" : "5.9.1" + "revision" : "513364f870f6bfc468f9d2ff0a95caccc10044c5", + "version" : "5.10.2" } } ], diff --git a/samples/client/petstore/swift6/alamofireLibrary/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift b/samples/client/petstore/swift6/alamofireLibrary/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift index 525a6f1c885..50b21d3b717 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift @@ -27,7 +27,7 @@ class DateFormatTests: XCTestCase { super.tearDown() } - func testEncodeToJSONAlwaysResultsInUTCEncodedDate() { + func testencodeToQueryStringAlwaysResultsInUTCEncodedDate() { var dateComponents = DateComponents() dateComponents.calendar = Calendar(identifier: .gregorian) dateComponents.year = 2018 @@ -47,7 +47,7 @@ class DateFormatTests: XCTestCase { return } - var encodedDate = utcDate.encodeToJSON(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String + var encodedDate = utcDate.encodeToQueryString(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String XCTAssert(encodedDate.hasSuffix("Z")) // test with a positive timzone offset from UTC @@ -59,7 +59,7 @@ class DateFormatTests: XCTestCase { return } - encodedDate = nonUTCDate1.encodeToJSON(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String + encodedDate = nonUTCDate1.encodeToQueryString(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String XCTAssert(encodedDate.hasSuffix("Z")) // test with a negative timzone offset from UTC @@ -71,7 +71,7 @@ class DateFormatTests: XCTestCase { return } - encodedDate = nonUTCDate2.encodeToJSON(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String + encodedDate = nonUTCDate2.encodeToQueryString(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String XCTAssert(encodedDate.hasSuffix("Z")) } diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Cartfile b/samples/client/petstore/swift6/apiNonStaticMethod/Cartfile index ae4acb9c5fc..b9ac9faa000 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Cartfile +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Cartfile @@ -1,4 +1,3 @@ -# TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes. -github "Alamofire/Alamofire" = 5.9.1 +github "Alamofire/Alamofire" = 5.10.2 github "mxcl/PromiseKit" ~> 8.1 github "ReactiveX/RxSwift" ~> 6.8 diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Package.resolved b/samples/client/petstore/swift6/apiNonStaticMethod/Package.resolved index 34a66b36fab..30d39070ac9 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Package.resolved +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "766b7b8894983c692454ee57aad3d618580bf90078cad51008d129ddf41ff945", + "originHash" : "271b0c60e4f6d7e4e95b242fe75853812e17a2a3c7fd43e160c0d750e9489a83", "pins" : [ { "identity" : "alamofire", "kind" : "remoteSourceControl", "location" : "https://github.com/Alamofire/Alamofire", "state" : { - "revision" : "f455c2975872ccd2d9c81594c658af65716e9b9a", - "version" : "5.9.1" + "revision" : "513364f870f6bfc468f9d2ff0a95caccc10044c5", + "version" : "5.10.2" } }, { diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift index 16458649fe4..91fe79acc28 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift @@ -19,8 +19,7 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - // TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes. - .package(url: "https://github.com/Alamofire/Alamofire", exact: "5.9.1"), + .package(url: "https://github.com/Alamofire/Alamofire", exact: "5.10.2"), .package(url: "https://github.com/mxcl/PromiseKit", .upToNextMajor(from: "8.1.2")), .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.8.0")), ], diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec index f69d9ae39c9..9ee7ee73769 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec +++ b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec @@ -11,8 +11,7 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/openapitools/openapi-generator' s.summary = 'PetstoreClient' s.source_files = 'Sources/PetstoreClient/**/*.swift' - # TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes. - s.dependency 'Alamofire', '5.9.1' + s.dependency 'Alamofire', '5.10.2' s.dependency 'PromiseKit/CorePromise', '~> 8.1' s.dependency 'RxSwift', '~> 6.8' end diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift index c995ca9eadb..e825c12d849 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift @@ -153,7 +153,7 @@ open class AnotherFakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeAPI.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeAPI.swift index 0dbc059ae72..178aeff9671 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeAPI.swift @@ -146,7 +146,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -285,7 +285,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -424,7 +424,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -563,7 +563,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -702,7 +702,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -847,10 +847,10 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "query": (wrappedValue: query.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "query": (wrappedValue: query.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -996,7 +996,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -1232,21 +1232,21 @@ open class FakeAPI { open func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "integer": integer?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int32": int32?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int64": int64?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "number": number.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "float": float?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "double": double.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "string": string?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "pattern_without_delimiter": patternWithoutDelimiter.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "byte": byte.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "binary": binary?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "date": date?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "dateTime": dateTime?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "password": password?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "callback": callback?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "integer": integer?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int32": int32?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int64": int64?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "number": number.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "float": float?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "double": double.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "string": string?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "pattern_without_delimiter": patternWithoutDelimiter.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "byte": byte.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "binary": binary?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "date": date?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "dateTime": dateTime?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "password": password?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "callback": callback?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -1254,7 +1254,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -1512,9 +1512,9 @@ open class FakeAPI { open func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "enum_form_string_array": enumFormStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_form_string": enumFormString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "enum_form_string_array": enumFormStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_form_string": enumFormString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -1522,16 +1522,16 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_string": (wrappedValue: enumQueryString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string": (wrappedValue: enumQueryString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", - "enum_header_string_array": enumHeaderStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_header_string": enumHeaderString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "enum_header_string_array": enumHeaderStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_header_string": enumHeaderString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -1707,19 +1707,19 @@ open class FakeAPI { open func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "required_string_group": (wrappedValue: requiredStringGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "required_int64_group": (wrappedValue: requiredInt64Group.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "string_group": (wrappedValue: stringGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "int64_group": (wrappedValue: int64Group?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_string_group": (wrappedValue: requiredStringGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_int64_group": (wrappedValue: requiredInt64Group.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "string_group": (wrappedValue: stringGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "int64_group": (wrappedValue: int64Group?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ - "required_boolean_group": requiredBooleanGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "boolean_group": booleanGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "required_boolean_group": requiredBooleanGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "boolean_group": booleanGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -1863,7 +1863,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -2011,9 +2011,9 @@ open class FakeAPI { open func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "param": param.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "param2": param2.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "param": param.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "param2": param2.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -2021,7 +2021,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift index e68dbde1d6e..70fa1efd0ff 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift @@ -156,7 +156,7 @@ open class FakeClassnameTags123API { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/PetAPI.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/PetAPI.swift index ef08592bd1a..73a0ac9919a 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/PetAPI.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/PetAPI.swift @@ -158,7 +158,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -312,12 +312,12 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ - "api_key": apiKey?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "api_key": apiKey?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -470,14 +470,14 @@ open class PetAPI { open func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "status": (wrappedValue: status.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "status": (wrappedValue: status.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -629,14 +629,14 @@ open class PetAPI { open func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "tags": (wrappedValue: tags.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "tags": (wrappedValue: tags.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -784,11 +784,11 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -936,7 +936,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -1097,9 +1097,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "name": name?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "status": status?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "name": name?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "status": status?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -1107,7 +1107,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -1268,9 +1268,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "file": file?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "file": file?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -1278,7 +1278,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] @@ -1439,9 +1439,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "requiredFile": requiredFile.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "requiredFile": requiredFile.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -1449,7 +1449,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/StoreAPI.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/StoreAPI.swift index ead2ffcadf0..4b0490a5563 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/StoreAPI.swift @@ -152,11 +152,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -294,11 +294,11 @@ open class StoreAPI { open func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -443,11 +443,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -592,7 +592,7 @@ open class StoreAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/UserAPI.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/UserAPI.swift index e9b58fdb678..ab4c065bcfb 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/UserAPI.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/UserAPI.swift @@ -153,7 +153,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -298,7 +298,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -443,7 +443,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -588,11 +588,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -736,11 +736,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -889,15 +889,15 @@ open class UserAPI { open func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { let localVariablePath = "/user/login" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "username": (wrappedValue: username.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "password": (wrappedValue: password.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "username": (wrappedValue: username.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "password": (wrappedValue: password.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -1031,11 +1031,11 @@ open class UserAPI { open func logoutUserWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/user/logout" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -1191,7 +1191,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIs.swift index 8e9136fba19..2f357e22fb6 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIs.swift @@ -64,7 +64,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -74,7 +74,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift index b9ec99239b6..6ab188305e2 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift @@ -28,7 +28,7 @@ fileprivate class AlamofireRequestBuilderConfiguration: @unchecked Sendable { } open class AlamofireRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -86,7 +86,7 @@ open class AlamofireRequestBuilder: RequestBuilder, @unchecked Sendable { } @discardableResult - override open func execute(completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) -> RequestTask { + override open func execute(completion: @Sendable @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) -> RequestTask { let managerId = UUID().uuidString // Create a new manager for each request to customize its request header let manager = createAlamofireSession() @@ -163,12 +163,12 @@ open class AlamofireRequestBuilder: RequestBuilder, @unchecked Sendable { return requestTask } - fileprivate func processRequest(request: DataRequest, managerId: String, completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { + fileprivate func processRequest(request: DataRequest, managerId: String, completion: @Sendable @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { if let credential = self.credential { request.authenticate(with: credential) } - let cleanupRequest = { + let cleanupRequest = { @Sendable in AlamofireRequestBuilderConfiguration.shared.managerStore[managerId] = nil } @@ -257,12 +257,12 @@ open class AlamofireRequestBuilder: RequestBuilder, @unchecked Sendable { open class AlamofireDecodableRequestBuilder: AlamofireRequestBuilder, @unchecked Sendable { - override fileprivate func processRequest(request: DataRequest, managerId: String, completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { + override fileprivate func processRequest(request: DataRequest, managerId: String, completion: @Sendable @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { if let credential = self.credential { request.authenticate(with: credential) } - let cleanupRequest = { + let cleanupRequest = { @Sendable in AlamofireRequestBuilderConfiguration.shared.managerStore[managerId] = nil } @@ -415,6 +415,6 @@ extension JSONDataEncoding: ParameterEncoding { public func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest { let urlRequest = try urlRequest.asURLRequest() - return encode(urlRequest, with: parameters) + return encode(request: urlRequest, with: parameters) } } 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 695a1bc866f..0f92498171e 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -10,73 +10,49 @@ import FoundationNetworking #endif @preconcurrency import PromiseKit -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -84,24 +60,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Models.swift index 9f52fd5393e..9414c8dfaeb 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Models.swift @@ -10,8 +10,8 @@ import FoundationNetworking #endif import Alamofire -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. @@ -119,9 +119,9 @@ extension Response : Sendable where T : Sendable {} /// Type-erased ResponseSerializer /// /// This is needed in order to use `ResponseSerializer` as a Type in `Configuration`. Obsolete with `any` keyword in Swift >= 5.7 -public struct AnyResponseSerializer: ResponseSerializer { +public struct AnyResponseSerializer: ResponseSerializer { - let _serialize: (URLRequest?, HTTPURLResponse?, Data?, Error?) throws -> T + let _serialize: @Sendable (URLRequest?, HTTPURLResponse?, Data?, Error?) throws -> T public init(_ delegatee: V) where V.SerializedObject == T { _serialize = delegatee.serialize diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift index ca940fd8662..9bd081f7d00 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var mapString: [String: String]? public var mapMapString: [String: [String: String]]? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Animal.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Animal.swift index c8a6f210c55..b20104e0503 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Animal.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Animal.swift @@ -7,7 +7,7 @@ import Foundation -public struct Animal: Sendable, Codable, JSONEncodable, Hashable { +public struct Animal: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ApiResponse.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ApiResponse.swift index a8d7a4a1423..cea25ea52e2 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ApiResponse.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ApiResponse.swift @@ -7,7 +7,7 @@ import Foundation -public struct ApiResponse: Sendable, Codable, JSONEncodable, Hashable { +public struct ApiResponse: Sendable, Codable, QueryStringEncodable, Hashable { public var code: Int? public var type: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift index e569ab1877e..679279d61cb 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayArrayNumber: [[Double]]? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift index 2dd67b1cb58..d71bd4e40b7 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayNumber: [Double]? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayTest.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayTest.swift index 21943123d9e..839795229bb 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayTest.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayTest: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayTest: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayOfString: [String]? public var arrayArrayOfInteger: [[Int64]]? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Capitalization.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Capitalization.swift index 55de9b34a29..56100523e84 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Capitalization.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Capitalization.swift @@ -7,7 +7,7 @@ import Foundation -public struct Capitalization: Sendable, Codable, JSONEncodable, Hashable { +public struct Capitalization: Sendable, Codable, QueryStringEncodable, Hashable { public var smallCamel: String? public var capitalCamel: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Cat.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Cat.swift index 80ff359c186..cceeddd1bf9 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Cat.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Cat.swift @@ -7,7 +7,7 @@ import Foundation -public struct Cat: Sendable, Codable, JSONEncodable, Hashable { +public struct Cat: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift index d1cceeccfe8..c04a9e673cf 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift @@ -7,7 +7,7 @@ import Foundation -public struct Category: Sendable, Codable, JSONEncodable, Hashable { +public struct Category: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? = "default-name" diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ClassModel.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ClassModel.swift index 45546a7b33f..4c1e9c1a990 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ClassModel.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ClassModel.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model with \"_class\" property */ -public struct ClassModel: Sendable, Codable, JSONEncodable, Hashable { +public struct ClassModel: Sendable, Codable, QueryStringEncodable, Hashable { public var _class: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Client.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Client.swift index e6792283509..b49ded4cc5c 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Client.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Client.swift @@ -7,7 +7,7 @@ import Foundation -public struct Client: Sendable, Codable, JSONEncodable, Hashable { +public struct Client: Sendable, Codable, QueryStringEncodable, Hashable { public var client: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Dog.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Dog.swift index 9cb18da8a57..99231ca03f7 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Dog.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Dog.swift @@ -7,7 +7,7 @@ import Foundation -public struct Dog: Sendable, Codable, JSONEncodable, Hashable { +public struct Dog: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumArrays.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumArrays.swift index a8f557dfc8e..09bbcb9f280 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumArrays.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumArrays.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumArrays: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumArrays: Sendable, Codable, QueryStringEncodable, Hashable { public enum JustSymbol: String, Sendable, Codable, CaseIterable { case greaterThanOrEqualTo = ">=" diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumTest.swift index 298f93c69bd..d280112e88b 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumTest: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum EnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/File.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/File.swift index 989bc5d0837..c35e1b2d53a 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/File.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/File.swift @@ -8,7 +8,7 @@ import Foundation /** Must be named `File` for test. */ -public struct File: Sendable, Codable, JSONEncodable, Hashable { +public struct File: Sendable, Codable, QueryStringEncodable, Hashable { /** Test capitalization */ public var sourceURI: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FileSchemaTestClass.swift index 4e7e54f8ca2..6ca430a91ba 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FileSchemaTestClass.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FileSchemaTestClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct FileSchemaTestClass: Sendable, Codable, JSONEncodable, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, QueryStringEncodable, Hashable { public var file: File? public var files: [File]? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FormatTest.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FormatTest.swift index 578959cee5d..010eddcabde 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FormatTest.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FormatTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct FormatTest: Sendable, Codable, JSONEncodable, Hashable { +public struct FormatTest: Sendable, Codable, QueryStringEncodable, Hashable { public static let integerRule = NumericRule(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil) public static let int32Rule = NumericRule(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil) diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift index 15c2cd2feee..e5db6255169 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct HasOnlyReadOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var foo: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/List.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/List.swift index a35819ac5ee..75c553df8fc 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/List.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/List.swift @@ -7,7 +7,7 @@ import Foundation -public struct List: Sendable, Codable, JSONEncodable, Hashable { +public struct List: Sendable, Codable, QueryStringEncodable, Hashable { public var _123list: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MapTest.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MapTest.swift index ce3646b2ac7..b52d28b69a1 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MapTest.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MapTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct MapTest: Sendable, Codable, JSONEncodable, Hashable { +public struct MapTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum MapOfEnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift index 58d90fe83c5..2c7bd6d9c7c 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var uuid: UUID? public var dateTime: Date? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Model200Response.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Model200Response.swift index 550840b8a4c..dfe19e3fdd9 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Model200Response.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Model200Response.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name starting with number */ -public struct Model200Response: Sendable, Codable, JSONEncodable, Hashable { +public struct Model200Response: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int? public var _class: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Name.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Name.swift index b72dd32ecba..d0a98e0980b 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Name.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Name.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name same as property name */ -public struct Name: Sendable, Codable, JSONEncodable, Hashable { +public struct Name: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int public var snakeCase: NullEncodable = .encodeValue(11033) diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/NumberOnly.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/NumberOnly.swift index f2a25b6f0d2..47d2e318bb5 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/NumberOnly.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/NumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct NumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct NumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var justNumber: Double? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift index 9bc6ecf183e..6a9ecc5540c 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift @@ -7,7 +7,7 @@ import Foundation -public struct Order: Sendable, Codable, JSONEncodable, Hashable { +public struct Order: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case placed = "placed" diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterComposite.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterComposite.swift index 9d8a17c8fd2..0a4d002a2dd 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterComposite.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterComposite.swift @@ -7,7 +7,7 @@ import Foundation -public struct OuterComposite: Sendable, Codable, JSONEncodable, Hashable { +public struct OuterComposite: Sendable, Codable, QueryStringEncodable, Hashable { public var myNumber: Double? public var myString: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift index b1ccb862d1a..302a3052c6e 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift @@ -7,7 +7,7 @@ import Foundation -public struct Pet: Sendable, Codable, JSONEncodable, Hashable { +public struct Pet: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case available = "available" diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ReadOnlyFirst.swift index 5c98c4b1fef..5a06da436f6 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ReadOnlyFirst.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ReadOnlyFirst.swift @@ -7,7 +7,7 @@ import Foundation -public struct ReadOnlyFirst: Sendable, Codable, JSONEncodable, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var baz: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Return.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Return.swift index 261d6d690b8..53ca3f5ad7f 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Return.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Return.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing reserved words */ -public struct Return: Sendable, Codable, JSONEncodable, Hashable { +public struct Return: Sendable, Codable, QueryStringEncodable, Hashable { public var _return: Int? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/SpecialModelName.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/SpecialModelName.swift index d566fc2b6eb..40ad8ff0a05 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/SpecialModelName.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/SpecialModelName.swift @@ -7,7 +7,7 @@ import Foundation -public struct SpecialModelName: Sendable, Codable, JSONEncodable, Hashable { +public struct SpecialModelName: Sendable, Codable, QueryStringEncodable, Hashable { public var specialPropertyName: Int64? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift index 514e6abfcee..7c19767a11f 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift @@ -7,7 +7,7 @@ import Foundation -public struct Tag: Sendable, Codable, JSONEncodable, Hashable { +public struct Tag: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderDefault.swift index a3fa21d8cb5..eaaab729500 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderDefault.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderDefault.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderDefault: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderDefault: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String = "what" public var numberItem: Double diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderExample.swift index 6102e9a3726..bac80c4fcd2 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderExample.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderExample: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderExample: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String public var numberItem: Double diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift index ecdde64a8d1..e41975d4d66 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift @@ -7,7 +7,7 @@ import Foundation -public struct User: Sendable, Codable, JSONEncodable, Hashable { +public struct User: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift b/samples/client/petstore/swift6/apiNonStaticMethod/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift index e2be777235e..f43452c2d49 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift @@ -23,28 +23,28 @@ class APIHelperTests: XCTestCase { } func testRejectNil() { - let source: [String: Any?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] - let expected: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] - let actual: [String: Any] = APIHelper.rejectNil(source)! + let source: [String: (any Sendable)?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] + let expected: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let actual: [String: any Sendable] = APIHelper.rejectNil(source)! XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testRejectNilHeaders() { - let source: [String: Any?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] + let source: [String: (any Sendable)?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] let expected: [String: String] = ["a": "1", "c": "1,2", "d": "true", "e": "false"] let actual: [String: String] = APIHelper.rejectNilHeaders(source) XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testConvertBoolToString() { - let source: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] - let expected: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": "true", "e": "false"] - let actual: [String: Any] = APIHelper.convertBoolToString(source)! + let source: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let expected: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": "true", "e": "false"] + let actual: [String: any Sendable] = APIHelper.convertBoolToString(source)! XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testMapValuesToQueryItems() { - let source: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let source: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] let expected: [URLQueryItem] = [URLQueryItem(name: "a", value: "1"), URLQueryItem(name: "c", value: "1"), URLQueryItem(name: "c", value: "2"), diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift index 26c9c55d0c7..961bc491b4e 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift @@ -36,7 +36,7 @@ open class AnotherFakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift index be40f28684e..b388f5c5571 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift @@ -34,7 +34,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -70,7 +70,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -106,7 +106,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -142,7 +142,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -178,7 +178,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -215,10 +215,10 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "query": (wrappedValue: query.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "query": (wrappedValue: query.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -256,7 +256,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -319,21 +319,21 @@ open class FakeAPI { open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "integer": integer?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int32": int32?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int64": int64?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "number": number.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "float": float?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "double": double.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "string": string?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "pattern_without_delimiter": patternWithoutDelimiter.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "byte": byte.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "binary": binary?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "date": date?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "dateTime": dateTime?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "password": password?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "callback": callback?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "integer": integer?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int32": int32?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int64": int64?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "number": number.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "float": float?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "double": double.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "string": string?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "pattern_without_delimiter": patternWithoutDelimiter.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "byte": byte.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "binary": binary?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "date": date?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "dateTime": dateTime?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "password": password?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "callback": callback?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -341,7 +341,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -456,9 +456,9 @@ open class FakeAPI { open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "enum_form_string_array": enumFormStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_form_string": enumFormString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "enum_form_string_array": enumFormStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_form_string": enumFormString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -466,16 +466,16 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_string": (wrappedValue: enumQueryString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string": (wrappedValue: enumQueryString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", - "enum_header_string_array": enumHeaderStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_header_string": enumHeaderString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "enum_header_string_array": enumHeaderStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_header_string": enumHeaderString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -518,19 +518,19 @@ open class FakeAPI { open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "required_string_group": (wrappedValue: requiredStringGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "required_int64_group": (wrappedValue: requiredInt64Group.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "string_group": (wrappedValue: stringGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "int64_group": (wrappedValue: int64Group?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_string_group": (wrappedValue: requiredStringGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_int64_group": (wrappedValue: requiredInt64Group.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "string_group": (wrappedValue: stringGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "int64_group": (wrappedValue: int64Group?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ - "required_boolean_group": requiredBooleanGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "boolean_group": booleanGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "required_boolean_group": requiredBooleanGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "boolean_group": booleanGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -566,7 +566,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -601,9 +601,9 @@ open class FakeAPI { open class func testJsonFormDataWithRequestBuilder(param: String, param2: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "param": param.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "param2": param2.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "param": param.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "param2": param2.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -611,7 +611,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift index 60601c0a064..77649e66360 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift @@ -39,7 +39,7 @@ open class FakeClassnameTags123API { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/PetAPI.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/PetAPI.swift index 8b13da8f044..d680aa5e425 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/PetAPI.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/PetAPI.swift @@ -41,7 +41,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -82,12 +82,12 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ - "api_key": apiKey?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "api_key": apiKey?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -132,14 +132,14 @@ open class PetAPI { open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "status": (wrappedValue: status.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "status": (wrappedValue: status.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -178,14 +178,14 @@ open class PetAPI { open class func findPetsByTagsWithRequestBuilder(tags: [String], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "tags": (wrappedValue: tags.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "tags": (wrappedValue: tags.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -225,11 +225,11 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -269,7 +269,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -312,9 +312,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "name": name?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "status": status?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "name": name?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "status": status?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -322,7 +322,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -365,9 +365,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "file": file?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "file": file?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -375,7 +375,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] @@ -418,9 +418,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "requiredFile": requiredFile.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "requiredFile": requiredFile.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -428,7 +428,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift index 2cf262bb26f..06e30274cec 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift @@ -35,11 +35,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -74,11 +74,11 @@ open class StoreAPI { open class func getInventoryWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -115,11 +115,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -156,7 +156,7 @@ open class StoreAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/UserAPI.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/UserAPI.swift index bfd8fb7e9a5..83974395c2c 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/UserAPI.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/UserAPI.swift @@ -36,7 +36,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -73,7 +73,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -110,7 +110,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -147,11 +147,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -187,11 +187,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -227,15 +227,15 @@ open class UserAPI { open class func loginUserWithRequestBuilder(username: String, password: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/login" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "username": (wrappedValue: username.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "password": (wrappedValue: password.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "username": (wrappedValue: username.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "password": (wrappedValue: password.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -266,11 +266,11 @@ open class UserAPI { open class func logoutUserWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/logout" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -313,7 +313,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift index 0aa641e0476..d661e55478e 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift @@ -50,7 +50,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -60,7 +60,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters 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 b4341b60870..7dd50aa2e70 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -9,73 +9,49 @@ import Foundation import FoundationNetworking #endif -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -83,24 +59,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Models.swift index f8e21e4d184..78a06110af5 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Models.swift @@ -9,8 +9,8 @@ import Foundation import FoundationNetworking #endif -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift index a583e24501b..802e927474b 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ public enum HTTPMethod: String { } public protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift index ca940fd8662..9bd081f7d00 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var mapString: [String: String]? public var mapMapString: [String: [String: String]]? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Animal.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Animal.swift index c8a6f210c55..b20104e0503 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Animal.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Animal.swift @@ -7,7 +7,7 @@ import Foundation -public struct Animal: Sendable, Codable, JSONEncodable, Hashable { +public struct Animal: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ApiResponse.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ApiResponse.swift index a8d7a4a1423..cea25ea52e2 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ApiResponse.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ApiResponse.swift @@ -7,7 +7,7 @@ import Foundation -public struct ApiResponse: Sendable, Codable, JSONEncodable, Hashable { +public struct ApiResponse: Sendable, Codable, QueryStringEncodable, Hashable { public var code: Int? public var type: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift index e569ab1877e..679279d61cb 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayArrayNumber: [[Double]]? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift index 2dd67b1cb58..d71bd4e40b7 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayNumber: [Double]? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayTest.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayTest.swift index 21943123d9e..839795229bb 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayTest.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayTest: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayTest: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayOfString: [String]? public var arrayArrayOfInteger: [[Int64]]? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Capitalization.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Capitalization.swift index 55de9b34a29..56100523e84 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Capitalization.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Capitalization.swift @@ -7,7 +7,7 @@ import Foundation -public struct Capitalization: Sendable, Codable, JSONEncodable, Hashable { +public struct Capitalization: Sendable, Codable, QueryStringEncodable, Hashable { public var smallCamel: String? public var capitalCamel: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Cat.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Cat.swift index 80ff359c186..cceeddd1bf9 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Cat.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Cat.swift @@ -7,7 +7,7 @@ import Foundation -public struct Cat: Sendable, Codable, JSONEncodable, Hashable { +public struct Cat: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift index d1cceeccfe8..c04a9e673cf 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift @@ -7,7 +7,7 @@ import Foundation -public struct Category: Sendable, Codable, JSONEncodable, Hashable { +public struct Category: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? = "default-name" diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ClassModel.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ClassModel.swift index 45546a7b33f..4c1e9c1a990 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ClassModel.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ClassModel.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model with \"_class\" property */ -public struct ClassModel: Sendable, Codable, JSONEncodable, Hashable { +public struct ClassModel: Sendable, Codable, QueryStringEncodable, Hashable { public var _class: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Client.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Client.swift index e6792283509..b49ded4cc5c 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Client.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Client.swift @@ -7,7 +7,7 @@ import Foundation -public struct Client: Sendable, Codable, JSONEncodable, Hashable { +public struct Client: Sendable, Codable, QueryStringEncodable, Hashable { public var client: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Dog.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Dog.swift index 9cb18da8a57..99231ca03f7 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Dog.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Dog.swift @@ -7,7 +7,7 @@ import Foundation -public struct Dog: Sendable, Codable, JSONEncodable, Hashable { +public struct Dog: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumArrays.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumArrays.swift index a8f557dfc8e..09bbcb9f280 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumArrays.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumArrays.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumArrays: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumArrays: Sendable, Codable, QueryStringEncodable, Hashable { public enum JustSymbol: String, Sendable, Codable, CaseIterable { case greaterThanOrEqualTo = ">=" diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumTest.swift index 298f93c69bd..d280112e88b 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumTest: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum EnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/File.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/File.swift index 989bc5d0837..c35e1b2d53a 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/File.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/File.swift @@ -8,7 +8,7 @@ import Foundation /** Must be named `File` for test. */ -public struct File: Sendable, Codable, JSONEncodable, Hashable { +public struct File: Sendable, Codable, QueryStringEncodable, Hashable { /** Test capitalization */ public var sourceURI: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift index 4e7e54f8ca2..6ca430a91ba 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct FileSchemaTestClass: Sendable, Codable, JSONEncodable, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, QueryStringEncodable, Hashable { public var file: File? public var files: [File]? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FormatTest.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FormatTest.swift index 3bfc12535c3..427b85e7fd9 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FormatTest.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FormatTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct FormatTest: Sendable, Codable, JSONEncodable, Hashable { +public struct FormatTest: Sendable, Codable, QueryStringEncodable, Hashable { public static let integerRule = NumericRule(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil) public static let int32Rule = NumericRule(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil) diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift index 15c2cd2feee..e5db6255169 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct HasOnlyReadOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var foo: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/List.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/List.swift index a35819ac5ee..75c553df8fc 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/List.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/List.swift @@ -7,7 +7,7 @@ import Foundation -public struct List: Sendable, Codable, JSONEncodable, Hashable { +public struct List: Sendable, Codable, QueryStringEncodable, Hashable { public var _123list: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MapTest.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MapTest.swift index be8a35e8fcc..8cc06717f31 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MapTest.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MapTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct MapTest: Sendable, Codable, JSONEncodable, Hashable { +public struct MapTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum MapOfEnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift index 58d90fe83c5..2c7bd6d9c7c 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var uuid: UUID? public var dateTime: Date? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Model200Response.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Model200Response.swift index 550840b8a4c..dfe19e3fdd9 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Model200Response.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Model200Response.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name starting with number */ -public struct Model200Response: Sendable, Codable, JSONEncodable, Hashable { +public struct Model200Response: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int? public var _class: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Name.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Name.swift index b72dd32ecba..d0a98e0980b 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Name.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Name.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name same as property name */ -public struct Name: Sendable, Codable, JSONEncodable, Hashable { +public struct Name: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int public var snakeCase: NullEncodable = .encodeValue(11033) diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/NumberOnly.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/NumberOnly.swift index f2a25b6f0d2..47d2e318bb5 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/NumberOnly.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/NumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct NumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct NumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var justNumber: Double? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift index 9bc6ecf183e..6a9ecc5540c 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift @@ -7,7 +7,7 @@ import Foundation -public struct Order: Sendable, Codable, JSONEncodable, Hashable { +public struct Order: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case placed = "placed" diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterComposite.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterComposite.swift index 9d8a17c8fd2..0a4d002a2dd 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterComposite.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterComposite.swift @@ -7,7 +7,7 @@ import Foundation -public struct OuterComposite: Sendable, Codable, JSONEncodable, Hashable { +public struct OuterComposite: Sendable, Codable, QueryStringEncodable, Hashable { public var myNumber: Double? public var myString: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift index b1ccb862d1a..302a3052c6e 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift @@ -7,7 +7,7 @@ import Foundation -public struct Pet: Sendable, Codable, JSONEncodable, Hashable { +public struct Pet: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case available = "available" diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift index 5c98c4b1fef..5a06da436f6 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift @@ -7,7 +7,7 @@ import Foundation -public struct ReadOnlyFirst: Sendable, Codable, JSONEncodable, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var baz: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Return.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Return.swift index 261d6d690b8..53ca3f5ad7f 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Return.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Return.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing reserved words */ -public struct Return: Sendable, Codable, JSONEncodable, Hashable { +public struct Return: Sendable, Codable, QueryStringEncodable, Hashable { public var _return: Int? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift index d566fc2b6eb..40ad8ff0a05 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift @@ -7,7 +7,7 @@ import Foundation -public struct SpecialModelName: Sendable, Codable, JSONEncodable, Hashable { +public struct SpecialModelName: Sendable, Codable, QueryStringEncodable, Hashable { public var specialPropertyName: Int64? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift index 847f1e87afd..3bbade9feb7 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift @@ -7,7 +7,7 @@ import Foundation -public struct StringBooleanMap: Sendable, Codable, JSONEncodable, Hashable { +public struct StringBooleanMap: Sendable, Codable, QueryStringEncodable, Hashable { public enum CodingKeys: CodingKey, CaseIterable { diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift index 514e6abfcee..7c19767a11f 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift @@ -7,7 +7,7 @@ import Foundation -public struct Tag: Sendable, Codable, JSONEncodable, Hashable { +public struct Tag: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift index a3fa21d8cb5..eaaab729500 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderDefault: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderDefault: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String = "what" public var numberItem: Double diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift index 6102e9a3726..bac80c4fcd2 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderExample: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderExample: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String public var numberItem: Double diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift index ecdde64a8d1..e41975d4d66 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift @@ -7,7 +7,7 @@ import Foundation -public struct User: Sendable, Codable, JSONEncodable, Hashable { +public struct User: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift index e2be777235e..f43452c2d49 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift @@ -23,28 +23,28 @@ class APIHelperTests: XCTestCase { } func testRejectNil() { - let source: [String: Any?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] - let expected: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] - let actual: [String: Any] = APIHelper.rejectNil(source)! + let source: [String: (any Sendable)?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] + let expected: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let actual: [String: any Sendable] = APIHelper.rejectNil(source)! XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testRejectNilHeaders() { - let source: [String: Any?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] + let source: [String: (any Sendable)?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] let expected: [String: String] = ["a": "1", "c": "1,2", "d": "true", "e": "false"] let actual: [String: String] = APIHelper.rejectNilHeaders(source) XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testConvertBoolToString() { - let source: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] - let expected: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": "true", "e": "false"] - let actual: [String: Any] = APIHelper.convertBoolToString(source)! + let source: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let expected: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": "true", "e": "false"] + let actual: [String: any Sendable] = APIHelper.convertBoolToString(source)! XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testMapValuesToQueryItems() { - let source: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let source: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] let expected: [URLQueryItem] = [URLQueryItem(name: "a", value: "1"), URLQueryItem(name: "c", value: "1"), URLQueryItem(name: "c", value: "2"), diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index 58d420545c5..fa46919c428 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -59,7 +59,7 @@ open class AnotherFakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index b7de3b3c944..66c40c7cfa1 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -57,7 +57,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -113,7 +113,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -169,7 +169,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -225,7 +225,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -281,7 +281,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -338,10 +338,10 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "query": (wrappedValue: query.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "query": (wrappedValue: query.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -399,7 +399,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -482,21 +482,21 @@ open class FakeAPI { open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "integer": integer?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int32": int32?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int64": int64?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "number": number.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "float": float?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "double": double.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "string": string?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "pattern_without_delimiter": patternWithoutDelimiter.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "byte": byte.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "binary": binary?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "date": date?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "dateTime": dateTime?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "password": password?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "callback": callback?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "integer": integer?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int32": int32?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int64": int64?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "number": number.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "float": float?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "double": double.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "string": string?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "pattern_without_delimiter": patternWithoutDelimiter.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "byte": byte.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "binary": binary?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "date": date?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "dateTime": dateTime?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "password": password?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "callback": callback?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -504,7 +504,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -639,9 +639,9 @@ open class FakeAPI { open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "enum_form_string_array": enumFormStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_form_string": enumFormString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "enum_form_string_array": enumFormStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_form_string": enumFormString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -649,16 +649,16 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_string": (wrappedValue: enumQueryString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string": (wrappedValue: enumQueryString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", - "enum_header_string_array": enumHeaderStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_header_string": enumHeaderString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "enum_header_string_array": enumHeaderStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_header_string": enumHeaderString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -721,19 +721,19 @@ open class FakeAPI { open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "required_string_group": (wrappedValue: requiredStringGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "required_int64_group": (wrappedValue: requiredInt64Group.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "string_group": (wrappedValue: stringGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "int64_group": (wrappedValue: int64Group?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_string_group": (wrappedValue: requiredStringGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_int64_group": (wrappedValue: requiredInt64Group.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "string_group": (wrappedValue: stringGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "int64_group": (wrappedValue: int64Group?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ - "required_boolean_group": requiredBooleanGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "boolean_group": booleanGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "required_boolean_group": requiredBooleanGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "boolean_group": booleanGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -789,7 +789,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -844,9 +844,9 @@ open class FakeAPI { open class func testJsonFormDataWithRequestBuilder(param: String, param2: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "param": param.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "param2": param2.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "param": param.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "param2": param2.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -854,7 +854,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index 29436cf4e89..856096b9e75 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -62,7 +62,7 @@ open class FakeClassnameTags123API { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index fceca27c8d5..1e2128072dd 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -64,7 +64,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -125,12 +125,12 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ - "api_key": apiKey?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "api_key": apiKey?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -195,14 +195,14 @@ open class PetAPI { open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "status": (wrappedValue: status.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "status": (wrappedValue: status.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -261,14 +261,14 @@ open class PetAPI { open class func findPetsByTagsWithRequestBuilder(tags: [String], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "tags": (wrappedValue: tags.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "tags": (wrappedValue: tags.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -328,11 +328,11 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -392,7 +392,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -455,9 +455,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "name": name?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "status": status?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "name": name?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "status": status?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -465,7 +465,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -528,9 +528,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "file": file?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "file": file?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -538,7 +538,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] @@ -601,9 +601,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "requiredFile": requiredFile.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "requiredFile": requiredFile.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -611,7 +611,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index 12ada44a3b6..8765e5c381a 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -58,11 +58,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -117,11 +117,11 @@ open class StoreAPI { open class func getInventoryWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -178,11 +178,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -239,7 +239,7 @@ open class StoreAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index bff93149e61..79b157a9842 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -59,7 +59,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -116,7 +116,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -173,7 +173,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -230,11 +230,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -290,11 +290,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -350,15 +350,15 @@ open class UserAPI { open class func loginUserWithRequestBuilder(username: String, password: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/login" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "username": (wrappedValue: username.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "password": (wrappedValue: password.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "username": (wrappedValue: username.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "password": (wrappedValue: password.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -409,11 +409,11 @@ open class UserAPI { open class func logoutUserWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/logout" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -476,7 +476,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 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 @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift index 6d50744862b..fadb83874b9 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift @@ -50,7 +50,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -60,7 +60,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters 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 b4341b60870..7dd50aa2e70 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,73 +9,49 @@ import Foundation import FoundationNetworking #endif -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -83,24 +59,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index f8e21e4d184..78a06110af5 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -9,8 +9,8 @@ import Foundation import FoundationNetworking #endif -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift index a583e24501b..802e927474b 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ public enum HTTPMethod: String { } public protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift index ca940fd8662..9bd081f7d00 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var mapString: [String: String]? public var mapMapString: [String: [String: String]]? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift index c8a6f210c55..b20104e0503 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift @@ -7,7 +7,7 @@ import Foundation -public struct Animal: Sendable, Codable, JSONEncodable, Hashable { +public struct Animal: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift index a8d7a4a1423..cea25ea52e2 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift @@ -7,7 +7,7 @@ import Foundation -public struct ApiResponse: Sendable, Codable, JSONEncodable, Hashable { +public struct ApiResponse: Sendable, Codable, QueryStringEncodable, Hashable { public var code: Int? public var type: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift index e569ab1877e..679279d61cb 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayArrayNumber: [[Double]]? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift index 2dd67b1cb58..d71bd4e40b7 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayNumber: [Double]? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift index 21943123d9e..839795229bb 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayTest: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayTest: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayOfString: [String]? public var arrayArrayOfInteger: [[Int64]]? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift index 55de9b34a29..56100523e84 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift @@ -7,7 +7,7 @@ import Foundation -public struct Capitalization: Sendable, Codable, JSONEncodable, Hashable { +public struct Capitalization: Sendable, Codable, QueryStringEncodable, Hashable { public var smallCamel: String? public var capitalCamel: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift index 80ff359c186..cceeddd1bf9 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift @@ -7,7 +7,7 @@ import Foundation -public struct Cat: Sendable, Codable, JSONEncodable, Hashable { +public struct Cat: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift index d1cceeccfe8..c04a9e673cf 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift @@ -7,7 +7,7 @@ import Foundation -public struct Category: Sendable, Codable, JSONEncodable, Hashable { +public struct Category: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? = "default-name" diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift index 45546a7b33f..4c1e9c1a990 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model with \"_class\" property */ -public struct ClassModel: Sendable, Codable, JSONEncodable, Hashable { +public struct ClassModel: Sendable, Codable, QueryStringEncodable, Hashable { public var _class: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift index e6792283509..b49ded4cc5c 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift @@ -7,7 +7,7 @@ import Foundation -public struct Client: Sendable, Codable, JSONEncodable, Hashable { +public struct Client: Sendable, Codable, QueryStringEncodable, Hashable { public var client: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift index 9cb18da8a57..99231ca03f7 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift @@ -7,7 +7,7 @@ import Foundation -public struct Dog: Sendable, Codable, JSONEncodable, Hashable { +public struct Dog: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift index a8f557dfc8e..09bbcb9f280 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumArrays: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumArrays: Sendable, Codable, QueryStringEncodable, Hashable { public enum JustSymbol: String, Sendable, Codable, CaseIterable { case greaterThanOrEqualTo = ">=" diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 298f93c69bd..d280112e88b 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumTest: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum EnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift index 989bc5d0837..c35e1b2d53a 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift @@ -8,7 +8,7 @@ import Foundation /** Must be named `File` for test. */ -public struct File: Sendable, Codable, JSONEncodable, Hashable { +public struct File: Sendable, Codable, QueryStringEncodable, Hashable { /** Test capitalization */ public var sourceURI: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift index 4e7e54f8ca2..6ca430a91ba 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct FileSchemaTestClass: Sendable, Codable, JSONEncodable, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, QueryStringEncodable, Hashable { public var file: File? public var files: [File]? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift index 3bfc12535c3..427b85e7fd9 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct FormatTest: Sendable, Codable, JSONEncodable, Hashable { +public struct FormatTest: Sendable, Codable, QueryStringEncodable, Hashable { public static let integerRule = NumericRule(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil) public static let int32Rule = NumericRule(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil) diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift index 15c2cd2feee..e5db6255169 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct HasOnlyReadOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var foo: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift index a35819ac5ee..75c553df8fc 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift @@ -7,7 +7,7 @@ import Foundation -public struct List: Sendable, Codable, JSONEncodable, Hashable { +public struct List: Sendable, Codable, QueryStringEncodable, Hashable { public var _123list: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift index be8a35e8fcc..8cc06717f31 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct MapTest: Sendable, Codable, JSONEncodable, Hashable { +public struct MapTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum MapOfEnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift index 58d90fe83c5..2c7bd6d9c7c 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var uuid: UUID? public var dateTime: Date? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift index 550840b8a4c..dfe19e3fdd9 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name starting with number */ -public struct Model200Response: Sendable, Codable, JSONEncodable, Hashable { +public struct Model200Response: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int? public var _class: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift index b72dd32ecba..d0a98e0980b 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name same as property name */ -public struct Name: Sendable, Codable, JSONEncodable, Hashable { +public struct Name: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int public var snakeCase: NullEncodable = .encodeValue(11033) diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift index f2a25b6f0d2..47d2e318bb5 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct NumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct NumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var justNumber: Double? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift index 9bc6ecf183e..6a9ecc5540c 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift @@ -7,7 +7,7 @@ import Foundation -public struct Order: Sendable, Codable, JSONEncodable, Hashable { +public struct Order: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case placed = "placed" diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift index 9d8a17c8fd2..0a4d002a2dd 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift @@ -7,7 +7,7 @@ import Foundation -public struct OuterComposite: Sendable, Codable, JSONEncodable, Hashable { +public struct OuterComposite: Sendable, Codable, QueryStringEncodable, Hashable { public var myNumber: Double? public var myString: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift index b1ccb862d1a..302a3052c6e 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift @@ -7,7 +7,7 @@ import Foundation -public struct Pet: Sendable, Codable, JSONEncodable, Hashable { +public struct Pet: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case available = "available" diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift index 5c98c4b1fef..5a06da436f6 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift @@ -7,7 +7,7 @@ import Foundation -public struct ReadOnlyFirst: Sendable, Codable, JSONEncodable, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var baz: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift index 261d6d690b8..53ca3f5ad7f 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing reserved words */ -public struct Return: Sendable, Codable, JSONEncodable, Hashable { +public struct Return: Sendable, Codable, QueryStringEncodable, Hashable { public var _return: Int? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift index d566fc2b6eb..40ad8ff0a05 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift @@ -7,7 +7,7 @@ import Foundation -public struct SpecialModelName: Sendable, Codable, JSONEncodable, Hashable { +public struct SpecialModelName: Sendable, Codable, QueryStringEncodable, Hashable { public var specialPropertyName: Int64? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift index 847f1e87afd..3bbade9feb7 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift @@ -7,7 +7,7 @@ import Foundation -public struct StringBooleanMap: Sendable, Codable, JSONEncodable, Hashable { +public struct StringBooleanMap: Sendable, Codable, QueryStringEncodable, Hashable { public enum CodingKeys: CodingKey, CaseIterable { diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift index 514e6abfcee..7c19767a11f 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift @@ -7,7 +7,7 @@ import Foundation -public struct Tag: Sendable, Codable, JSONEncodable, Hashable { +public struct Tag: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift index a3fa21d8cb5..eaaab729500 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderDefault: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderDefault: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String = "what" public var numberItem: Double diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift index 6102e9a3726..bac80c4fcd2 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderExample: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderExample: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String public var numberItem: Double diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift index ecdde64a8d1..e41975d4d66 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift @@ -7,7 +7,7 @@ import Foundation -public struct User: Sendable, Codable, JSONEncodable, Hashable { +public struct User: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift b/samples/client/petstore/swift6/combineDeferredLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift index e2be777235e..f43452c2d49 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift @@ -23,28 +23,28 @@ class APIHelperTests: XCTestCase { } func testRejectNil() { - let source: [String: Any?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] - let expected: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] - let actual: [String: Any] = APIHelper.rejectNil(source)! + let source: [String: (any Sendable)?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] + let expected: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let actual: [String: any Sendable] = APIHelper.rejectNil(source)! XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testRejectNilHeaders() { - let source: [String: Any?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] + let source: [String: (any Sendable)?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] let expected: [String: String] = ["a": "1", "c": "1,2", "d": "true", "e": "false"] let actual: [String: String] = APIHelper.rejectNilHeaders(source) XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testConvertBoolToString() { - let source: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] - let expected: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": "true", "e": "false"] - let actual: [String: Any] = APIHelper.convertBoolToString(source)! + let source: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let expected: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": "true", "e": "false"] + let actual: [String: any Sendable] = APIHelper.convertBoolToString(source)! XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testMapValuesToQueryItems() { - let source: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let source: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] let expected: [URLQueryItem] = [URLQueryItem(name: "a", value: "1"), URLQueryItem(name: "c", value: "1"), URLQueryItem(name: "c", value: "2"), diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/AnotherFakeAPI.swift index 923608a78ed..2cae740c373 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/AnotherFakeAPI.swift @@ -57,7 +57,7 @@ open class AnotherFakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeAPI.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeAPI.swift index d21dba7ede6..106c10712e6 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeAPI.swift @@ -55,7 +55,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -109,7 +109,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -163,7 +163,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -217,7 +217,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -271,7 +271,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -326,10 +326,10 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "query": (wrappedValue: query.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "query": (wrappedValue: query.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -385,7 +385,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -466,21 +466,21 @@ open class FakeAPI { open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "integer": integer?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int32": int32?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int64": int64?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "number": number.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "float": float?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "double": double.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "string": string?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "pattern_without_delimiter": patternWithoutDelimiter.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "byte": byte.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "binary": binary?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "date": date?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "dateTime": dateTime?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "password": password?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "callback": callback?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "integer": integer?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int32": int32?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int64": int64?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "number": number.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "float": float?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "double": double.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "string": string?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "pattern_without_delimiter": patternWithoutDelimiter.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "byte": byte.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "binary": binary?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "date": date?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "dateTime": dateTime?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "password": password?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "callback": callback?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -488,7 +488,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -621,9 +621,9 @@ open class FakeAPI { open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "enum_form_string_array": enumFormStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_form_string": enumFormString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "enum_form_string_array": enumFormStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_form_string": enumFormString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -631,16 +631,16 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_string": (wrappedValue: enumQueryString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string": (wrappedValue: enumQueryString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", - "enum_header_string_array": enumHeaderStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_header_string": enumHeaderString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "enum_header_string_array": enumHeaderStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_header_string": enumHeaderString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -701,19 +701,19 @@ open class FakeAPI { open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "required_string_group": (wrappedValue: requiredStringGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "required_int64_group": (wrappedValue: requiredInt64Group.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "string_group": (wrappedValue: stringGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "int64_group": (wrappedValue: int64Group?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_string_group": (wrappedValue: requiredStringGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_int64_group": (wrappedValue: requiredInt64Group.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "string_group": (wrappedValue: stringGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "int64_group": (wrappedValue: int64Group?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ - "required_boolean_group": requiredBooleanGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "boolean_group": booleanGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "required_boolean_group": requiredBooleanGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "boolean_group": booleanGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -767,7 +767,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -820,9 +820,9 @@ open class FakeAPI { open class func testJsonFormDataWithRequestBuilder(param: String, param2: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "param": param.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "param2": param2.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "param": param.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "param2": param2.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -830,7 +830,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeClassnameTags123API.swift index 3c5188c82de..d5fdb809489 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeClassnameTags123API.swift @@ -60,7 +60,7 @@ open class FakeClassnameTags123API { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/PetAPI.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/PetAPI.swift index 295633d9856..c31c5670bc0 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/PetAPI.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/PetAPI.swift @@ -62,7 +62,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -121,12 +121,12 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ - "api_key": apiKey?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "api_key": apiKey?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -189,14 +189,14 @@ open class PetAPI { open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "status": (wrappedValue: status.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "status": (wrappedValue: status.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -253,14 +253,14 @@ open class PetAPI { open class func findPetsByTagsWithRequestBuilder(tags: [String], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "tags": (wrappedValue: tags.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "tags": (wrappedValue: tags.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -318,11 +318,11 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -380,7 +380,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -441,9 +441,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "name": name?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "status": status?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "name": name?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "status": status?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -451,7 +451,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -512,9 +512,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "file": file?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "file": file?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -522,7 +522,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] @@ -583,9 +583,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "requiredFile": requiredFile.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "requiredFile": requiredFile.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -593,7 +593,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/StoreAPI.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/StoreAPI.swift index f5abc5f0de4..8f7ce1deb9b 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/StoreAPI.swift @@ -56,11 +56,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -113,11 +113,11 @@ open class StoreAPI { open class func getInventoryWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -172,11 +172,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -231,7 +231,7 @@ open class StoreAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/UserAPI.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/UserAPI.swift index 070313c7bed..f8f373e93a9 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/UserAPI.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/UserAPI.swift @@ -57,7 +57,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -112,7 +112,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -167,7 +167,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -222,11 +222,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -280,11 +280,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -338,15 +338,15 @@ open class UserAPI { open class func loginUserWithRequestBuilder(username: String, password: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/login" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "username": (wrappedValue: username.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "password": (wrappedValue: password.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "username": (wrappedValue: username.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "password": (wrappedValue: password.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -395,11 +395,11 @@ open class UserAPI { open class func logoutUserWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/logout" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -460,7 +460,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIHelper.swift @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIs.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIs.swift index 6d50744862b..fadb83874b9 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIs.swift @@ -50,7 +50,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -60,7 +60,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters 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 b4341b60870..7dd50aa2e70 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift @@ -9,73 +9,49 @@ import Foundation import FoundationNetworking #endif -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -83,24 +59,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Models.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Models.swift index f8e21e4d184..78a06110af5 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Models.swift @@ -9,8 +9,8 @@ import Foundation import FoundationNetworking #endif -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/URLSessionImplementations.swift index a583e24501b..802e927474b 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/URLSessionImplementations.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/URLSessionImplementations.swift @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ public enum HTTPMethod: String { } public protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/AdditionalPropertiesClass.swift index ca940fd8662..9bd081f7d00 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/AdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var mapString: [String: String]? public var mapMapString: [String: [String: String]]? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Animal.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Animal.swift index c8a6f210c55..b20104e0503 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Animal.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Animal.swift @@ -7,7 +7,7 @@ import Foundation -public struct Animal: Sendable, Codable, JSONEncodable, Hashable { +public struct Animal: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ApiResponse.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ApiResponse.swift index a8d7a4a1423..cea25ea52e2 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ApiResponse.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ApiResponse.swift @@ -7,7 +7,7 @@ import Foundation -public struct ApiResponse: Sendable, Codable, JSONEncodable, Hashable { +public struct ApiResponse: Sendable, Codable, QueryStringEncodable, Hashable { public var code: Int? public var type: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfArrayOfNumberOnly.swift index e569ab1877e..679279d61cb 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayArrayNumber: [[Double]]? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfNumberOnly.swift index 2dd67b1cb58..d71bd4e40b7 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayNumber: [Double]? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayTest.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayTest.swift index 21943123d9e..839795229bb 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayTest.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayTest: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayTest: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayOfString: [String]? public var arrayArrayOfInteger: [[Int64]]? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Capitalization.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Capitalization.swift index 55de9b34a29..56100523e84 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Capitalization.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Capitalization.swift @@ -7,7 +7,7 @@ import Foundation -public struct Capitalization: Sendable, Codable, JSONEncodable, Hashable { +public struct Capitalization: Sendable, Codable, QueryStringEncodable, Hashable { public var smallCamel: String? public var capitalCamel: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Cat.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Cat.swift index 80ff359c186..cceeddd1bf9 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Cat.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Cat.swift @@ -7,7 +7,7 @@ import Foundation -public struct Cat: Sendable, Codable, JSONEncodable, Hashable { +public struct Cat: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift index d1cceeccfe8..c04a9e673cf 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift @@ -7,7 +7,7 @@ import Foundation -public struct Category: Sendable, Codable, JSONEncodable, Hashable { +public struct Category: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? = "default-name" diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ClassModel.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ClassModel.swift index 45546a7b33f..4c1e9c1a990 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ClassModel.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ClassModel.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model with \"_class\" property */ -public struct ClassModel: Sendable, Codable, JSONEncodable, Hashable { +public struct ClassModel: Sendable, Codable, QueryStringEncodable, Hashable { public var _class: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Client.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Client.swift index e6792283509..b49ded4cc5c 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Client.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Client.swift @@ -7,7 +7,7 @@ import Foundation -public struct Client: Sendable, Codable, JSONEncodable, Hashable { +public struct Client: Sendable, Codable, QueryStringEncodable, Hashable { public var client: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Dog.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Dog.swift index 9cb18da8a57..99231ca03f7 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Dog.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Dog.swift @@ -7,7 +7,7 @@ import Foundation -public struct Dog: Sendable, Codable, JSONEncodable, Hashable { +public struct Dog: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumArrays.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumArrays.swift index a8f557dfc8e..09bbcb9f280 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumArrays.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumArrays.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumArrays: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumArrays: Sendable, Codable, QueryStringEncodable, Hashable { public enum JustSymbol: String, Sendable, Codable, CaseIterable { case greaterThanOrEqualTo = ">=" diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumTest.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumTest.swift index 298f93c69bd..d280112e88b 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumTest: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum EnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/File.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/File.swift index 989bc5d0837..c35e1b2d53a 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/File.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/File.swift @@ -8,7 +8,7 @@ import Foundation /** Must be named `File` for test. */ -public struct File: Sendable, Codable, JSONEncodable, Hashable { +public struct File: Sendable, Codable, QueryStringEncodable, Hashable { /** Test capitalization */ public var sourceURI: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FileSchemaTestClass.swift index 4e7e54f8ca2..6ca430a91ba 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FileSchemaTestClass.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FileSchemaTestClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct FileSchemaTestClass: Sendable, Codable, JSONEncodable, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, QueryStringEncodable, Hashable { public var file: File? public var files: [File]? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FormatTest.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FormatTest.swift index 3bfc12535c3..427b85e7fd9 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FormatTest.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FormatTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct FormatTest: Sendable, Codable, JSONEncodable, Hashable { +public struct FormatTest: Sendable, Codable, QueryStringEncodable, Hashable { public static let integerRule = NumericRule(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil) public static let int32Rule = NumericRule(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil) diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/HasOnlyReadOnly.swift index 15c2cd2feee..e5db6255169 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/HasOnlyReadOnly.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/HasOnlyReadOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct HasOnlyReadOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var foo: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/List.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/List.swift index a35819ac5ee..75c553df8fc 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/List.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/List.swift @@ -7,7 +7,7 @@ import Foundation -public struct List: Sendable, Codable, JSONEncodable, Hashable { +public struct List: Sendable, Codable, QueryStringEncodable, Hashable { public var _123list: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MapTest.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MapTest.swift index be8a35e8fcc..8cc06717f31 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MapTest.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MapTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct MapTest: Sendable, Codable, JSONEncodable, Hashable { +public struct MapTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum MapOfEnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MixedPropertiesAndAdditionalPropertiesClass.swift index 58d90fe83c5..2c7bd6d9c7c 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MixedPropertiesAndAdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var uuid: UUID? public var dateTime: Date? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Model200Response.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Model200Response.swift index 550840b8a4c..dfe19e3fdd9 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Model200Response.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Model200Response.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name starting with number */ -public struct Model200Response: Sendable, Codable, JSONEncodable, Hashable { +public struct Model200Response: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int? public var _class: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Name.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Name.swift index b72dd32ecba..d0a98e0980b 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Name.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Name.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name same as property name */ -public struct Name: Sendable, Codable, JSONEncodable, Hashable { +public struct Name: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int public var snakeCase: NullEncodable = .encodeValue(11033) diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/NumberOnly.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/NumberOnly.swift index f2a25b6f0d2..47d2e318bb5 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/NumberOnly.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/NumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct NumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct NumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var justNumber: Double? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift index 9bc6ecf183e..6a9ecc5540c 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift @@ -7,7 +7,7 @@ import Foundation -public struct Order: Sendable, Codable, JSONEncodable, Hashable { +public struct Order: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case placed = "placed" diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterComposite.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterComposite.swift index 9d8a17c8fd2..0a4d002a2dd 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterComposite.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterComposite.swift @@ -7,7 +7,7 @@ import Foundation -public struct OuterComposite: Sendable, Codable, JSONEncodable, Hashable { +public struct OuterComposite: Sendable, Codable, QueryStringEncodable, Hashable { public var myNumber: Double? public var myString: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift index b1ccb862d1a..302a3052c6e 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift @@ -7,7 +7,7 @@ import Foundation -public struct Pet: Sendable, Codable, JSONEncodable, Hashable { +public struct Pet: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case available = "available" diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ReadOnlyFirst.swift index 5c98c4b1fef..5a06da436f6 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ReadOnlyFirst.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ReadOnlyFirst.swift @@ -7,7 +7,7 @@ import Foundation -public struct ReadOnlyFirst: Sendable, Codable, JSONEncodable, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var baz: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Return.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Return.swift index 261d6d690b8..53ca3f5ad7f 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Return.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Return.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing reserved words */ -public struct Return: Sendable, Codable, JSONEncodable, Hashable { +public struct Return: Sendable, Codable, QueryStringEncodable, Hashable { public var _return: Int? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/SpecialModelName.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/SpecialModelName.swift index d566fc2b6eb..40ad8ff0a05 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/SpecialModelName.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/SpecialModelName.swift @@ -7,7 +7,7 @@ import Foundation -public struct SpecialModelName: Sendable, Codable, JSONEncodable, Hashable { +public struct SpecialModelName: Sendable, Codable, QueryStringEncodable, Hashable { public var specialPropertyName: Int64? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/StringBooleanMap.swift index 847f1e87afd..3bbade9feb7 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/StringBooleanMap.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/StringBooleanMap.swift @@ -7,7 +7,7 @@ import Foundation -public struct StringBooleanMap: Sendable, Codable, JSONEncodable, Hashable { +public struct StringBooleanMap: Sendable, Codable, QueryStringEncodable, Hashable { public enum CodingKeys: CodingKey, CaseIterable { diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift index 514e6abfcee..7c19767a11f 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift @@ -7,7 +7,7 @@ import Foundation -public struct Tag: Sendable, Codable, JSONEncodable, Hashable { +public struct Tag: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderDefault.swift index a3fa21d8cb5..eaaab729500 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderDefault.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderDefault.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderDefault: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderDefault: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String = "what" public var numberItem: Double diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderExample.swift index 6102e9a3726..bac80c4fcd2 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderExample.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderExample: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderExample: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String public var numberItem: Double diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift index ecdde64a8d1..e41975d4d66 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift @@ -7,7 +7,7 @@ import Foundation -public struct User: Sendable, Codable, JSONEncodable, Hashable { +public struct User: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/combineLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift b/samples/client/petstore/swift6/combineLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift index e2be777235e..f43452c2d49 100644 --- a/samples/client/petstore/swift6/combineLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift +++ b/samples/client/petstore/swift6/combineLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift @@ -23,28 +23,28 @@ class APIHelperTests: XCTestCase { } func testRejectNil() { - let source: [String: Any?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] - let expected: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] - let actual: [String: Any] = APIHelper.rejectNil(source)! + let source: [String: (any Sendable)?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] + let expected: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let actual: [String: any Sendable] = APIHelper.rejectNil(source)! XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testRejectNilHeaders() { - let source: [String: Any?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] + let source: [String: (any Sendable)?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] let expected: [String: String] = ["a": "1", "c": "1,2", "d": "true", "e": "false"] let actual: [String: String] = APIHelper.rejectNilHeaders(source) XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testConvertBoolToString() { - let source: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] - let expected: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": "true", "e": "false"] - let actual: [String: Any] = APIHelper.convertBoolToString(source)! + let source: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let expected: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": "true", "e": "false"] + let actual: [String: any Sendable] = APIHelper.convertBoolToString(source)! XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testMapValuesToQueryItems() { - let source: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let source: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] let expected: [URLQueryItem] = [URLQueryItem(name: "a", value: "1"), URLQueryItem(name: "c", value: "1"), URLQueryItem(name: "c", value: "2"), diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift index f5009bd4ad3..5c1e5f69bf5 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift @@ -38,9 +38,9 @@ open class AnotherFakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", - "uuid_test": uuidTest.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "uuid_test": uuidTest.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeAPI.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeAPI.swift index 49152f7b88e..f48558e30ab 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeAPI.swift @@ -36,7 +36,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/xml", ] @@ -72,7 +72,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -108,7 +108,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -144,7 +144,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -180,7 +180,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -216,7 +216,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -253,10 +253,10 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "query": (wrappedValue: query.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "query": (wrappedValue: query.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -294,7 +294,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -357,21 +357,21 @@ open class FakeAPI { open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "integer": integer?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int32": int32?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int64": int64?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "number": number.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "float": float?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "double": double.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "string": string?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "pattern_without_delimiter": patternWithoutDelimiter.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "byte": byte.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "binary": binary?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "date": date?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "dateTime": dateTime?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "password": password?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "callback": callback?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "integer": integer?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int32": int32?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int64": int64?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "number": number.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "float": float?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "double": double.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "string": string?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "pattern_without_delimiter": patternWithoutDelimiter.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "byte": byte.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "binary": binary?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "date": date?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "dateTime": dateTime?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "password": password?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "callback": callback?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -379,7 +379,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -494,9 +494,9 @@ open class FakeAPI { open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "enum_form_string_array": enumFormStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_form_string": enumFormString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "enum_form_string_array": enumFormStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_form_string": enumFormString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -504,16 +504,16 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_string": (wrappedValue: enumQueryString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string": (wrappedValue: enumQueryString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", - "enum_header_string_array": enumHeaderStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_header_string": enumHeaderString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "enum_header_string_array": enumHeaderStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_header_string": enumHeaderString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -556,19 +556,19 @@ open class FakeAPI { open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "required_string_group": (wrappedValue: requiredStringGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "required_int64_group": (wrappedValue: requiredInt64Group.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "string_group": (wrappedValue: stringGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "int64_group": (wrappedValue: int64Group?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_string_group": (wrappedValue: requiredStringGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_int64_group": (wrappedValue: requiredInt64Group.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "string_group": (wrappedValue: stringGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "int64_group": (wrappedValue: int64Group?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ - "required_boolean_group": requiredBooleanGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "boolean_group": booleanGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "required_boolean_group": requiredBooleanGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "boolean_group": booleanGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -604,7 +604,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -639,9 +639,9 @@ open class FakeAPI { open class func testJsonFormDataWithRequestBuilder(param: String, param2: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "param": param.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "param2": param2.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "param": param.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "param2": param2.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -649,7 +649,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -689,18 +689,18 @@ open class FakeAPI { open class func testQueryParameterCollectionFormatWithRequestBuilder(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake/test-query-parameters" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "pipe": (wrappedValue: pipe.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "ioutil": (wrappedValue: ioutil.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "http": (wrappedValue: http.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "url": (wrappedValue: url.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "context": (wrappedValue: context.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: true), + "pipe": (wrappedValue: pipe.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "ioutil": (wrappedValue: ioutil.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "http": (wrappedValue: http.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "url": (wrappedValue: url.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "context": (wrappedValue: context.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: true), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift index 60601c0a064..77649e66360 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift @@ -39,7 +39,7 @@ open class FakeClassnameTags123API { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/PetAPI.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/PetAPI.swift index 05c6a3f14df..04d43062920 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/PetAPI.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/PetAPI.swift @@ -38,7 +38,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -79,12 +79,12 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ - "api_key": apiKey?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "api_key": apiKey?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -129,14 +129,14 @@ open class PetAPI { open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "status": (wrappedValue: status.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "status": (wrappedValue: status.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -175,14 +175,14 @@ open class PetAPI { open class func findPetsByTagsWithRequestBuilder(tags: Set, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder> { let localVariablePath = "/pet/findByTags" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "tags": (wrappedValue: tags.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "tags": (wrappedValue: tags.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -222,11 +222,11 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -266,7 +266,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -309,9 +309,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "name": name?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "status": status?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "name": name?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "status": status?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -319,7 +319,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -362,9 +362,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "file": file?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "file": file?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -372,7 +372,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] @@ -415,9 +415,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "requiredFile": requiredFile.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "requiredFile": requiredFile.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -425,7 +425,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/StoreAPI.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/StoreAPI.swift index 2cf262bb26f..06e30274cec 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/StoreAPI.swift @@ -35,11 +35,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -74,11 +74,11 @@ open class StoreAPI { open class func getInventoryWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -115,11 +115,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -156,7 +156,7 @@ open class StoreAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/UserAPI.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/UserAPI.swift index bfd8fb7e9a5..83974395c2c 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/UserAPI.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/UserAPI.swift @@ -36,7 +36,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -73,7 +73,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -110,7 +110,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -147,11 +147,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -187,11 +187,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -227,15 +227,15 @@ open class UserAPI { open class func loginUserWithRequestBuilder(username: String, password: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/login" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "username": (wrappedValue: username.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "password": (wrappedValue: password.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "username": (wrappedValue: username.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "password": (wrappedValue: password.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -266,11 +266,11 @@ open class UserAPI { open class func logoutUserWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/logout" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -313,7 +313,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIs.swift index 0aa641e0476..d661e55478e 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIs.swift @@ -50,7 +50,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -60,7 +60,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters 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 b4341b60870..7dd50aa2e70 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -9,73 +9,49 @@ import Foundation import FoundationNetworking #endif -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -83,24 +59,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Models.swift index f8e21e4d184..78a06110af5 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Models.swift @@ -9,8 +9,8 @@ import Foundation import FoundationNetworking #endif -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift index a583e24501b..802e927474b 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ public enum HTTPMethod: String { } public protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesAnyType.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesAnyType.swift index dde0976efca..b196dcd18bc 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesAnyType.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesAnyType.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesAnyType: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesAnyType: Sendable, Codable, QueryStringEncodable, Hashable { public var name: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesArray.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesArray.swift index 63440493c93..bf92db2adb8 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesArray.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesArray.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesArray: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesArray: Sendable, Codable, QueryStringEncodable, Hashable { public var name: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesBoolean.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesBoolean.swift index 9aeb1d2131e..844686f06ca 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesBoolean.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesBoolean.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesBoolean: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesBoolean: Sendable, Codable, QueryStringEncodable, Hashable { public var name: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift index 9584060a272..2cab8f05644 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var mapString: [String: String]? public var mapNumber: [String: Double]? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesInteger.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesInteger.swift index 6a652a5e331..08efb93d204 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesInteger.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesInteger.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesInteger: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesInteger: Sendable, Codable, QueryStringEncodable, Hashable { public var name: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesNumber.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesNumber.swift index dc25e4c1727..ce1fd377f2a 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesNumber.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesNumber.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesNumber: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesNumber: Sendable, Codable, QueryStringEncodable, Hashable { public var name: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesObject.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesObject.swift index 1a92183031d..d46086c877b 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesObject.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesObject.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesObject: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesObject: Sendable, Codable, QueryStringEncodable, Hashable { public var name: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesString.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesString.swift index 0e5c90e63a7..75d613e8086 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesString.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesString.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesString: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesString: Sendable, Codable, QueryStringEncodable, Hashable { public var name: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Animal.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Animal.swift index c8a6f210c55..b20104e0503 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Animal.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Animal.swift @@ -7,7 +7,7 @@ import Foundation -public struct Animal: Sendable, Codable, JSONEncodable, Hashable { +public struct Animal: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ApiResponse.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ApiResponse.swift index a8d7a4a1423..cea25ea52e2 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ApiResponse.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ApiResponse.swift @@ -7,7 +7,7 @@ import Foundation -public struct ApiResponse: Sendable, Codable, JSONEncodable, Hashable { +public struct ApiResponse: Sendable, Codable, QueryStringEncodable, Hashable { public var code: Int? public var type: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift index e569ab1877e..679279d61cb 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayArrayNumber: [[Double]]? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift index 2dd67b1cb58..d71bd4e40b7 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayNumber: [Double]? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayTest.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayTest.swift index 21943123d9e..839795229bb 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayTest.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayTest: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayTest: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayOfString: [String]? public var arrayArrayOfInteger: [[Int64]]? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/BigCat.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/BigCat.swift index 653ccef6097..889e21b530b 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/BigCat.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/BigCat.swift @@ -7,7 +7,7 @@ import Foundation -public struct BigCat: Sendable, Codable, JSONEncodable, Hashable { +public struct BigCat: Sendable, Codable, QueryStringEncodable, Hashable { public enum Kind: String, Sendable, Codable, CaseIterable { case lions = "lions" diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Capitalization.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Capitalization.swift index 55de9b34a29..56100523e84 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Capitalization.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Capitalization.swift @@ -7,7 +7,7 @@ import Foundation -public struct Capitalization: Sendable, Codable, JSONEncodable, Hashable { +public struct Capitalization: Sendable, Codable, QueryStringEncodable, Hashable { public var smallCamel: String? public var capitalCamel: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Cat.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Cat.swift index 80ff359c186..cceeddd1bf9 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Cat.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Cat.swift @@ -7,7 +7,7 @@ import Foundation -public struct Cat: Sendable, Codable, JSONEncodable, Hashable { +public struct Cat: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift index f2eeddb30bb..e83ecfd44a0 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift @@ -7,7 +7,7 @@ import Foundation -public struct Category: Sendable, Codable, JSONEncodable, Hashable { +public struct Category: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String = "default-name" diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ClassModel.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ClassModel.swift index 45546a7b33f..4c1e9c1a990 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ClassModel.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ClassModel.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model with \"_class\" property */ -public struct ClassModel: Sendable, Codable, JSONEncodable, Hashable { +public struct ClassModel: Sendable, Codable, QueryStringEncodable, Hashable { public var _class: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Client.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Client.swift index e6792283509..b49ded4cc5c 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Client.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Client.swift @@ -7,7 +7,7 @@ import Foundation -public struct Client: Sendable, Codable, JSONEncodable, Hashable { +public struct Client: Sendable, Codable, QueryStringEncodable, Hashable { public var client: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Dog.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Dog.swift index 9cb18da8a57..99231ca03f7 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Dog.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Dog.swift @@ -7,7 +7,7 @@ import Foundation -public struct Dog: Sendable, Codable, JSONEncodable, Hashable { +public struct Dog: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumArrays.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumArrays.swift index a8f557dfc8e..09bbcb9f280 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumArrays.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumArrays.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumArrays: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumArrays: Sendable, Codable, QueryStringEncodable, Hashable { public enum JustSymbol: String, Sendable, Codable, CaseIterable { case greaterThanOrEqualTo = ">=" diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumTest.swift index 298f93c69bd..d280112e88b 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumTest: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum EnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/File.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/File.swift index 989bc5d0837..c35e1b2d53a 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/File.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/File.swift @@ -8,7 +8,7 @@ import Foundation /** Must be named `File` for test. */ -public struct File: Sendable, Codable, JSONEncodable, Hashable { +public struct File: Sendable, Codable, QueryStringEncodable, Hashable { /** Test capitalization */ public var sourceURI: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FileSchemaTestClass.swift index 4e7e54f8ca2..6ca430a91ba 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FileSchemaTestClass.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FileSchemaTestClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct FileSchemaTestClass: Sendable, Codable, JSONEncodable, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, QueryStringEncodable, Hashable { public var file: File? public var files: [File]? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FormatTest.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FormatTest.swift index 0adfc551003..61e17db120b 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FormatTest.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FormatTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct FormatTest: Sendable, Codable, JSONEncodable, Hashable { +public struct FormatTest: Sendable, Codable, QueryStringEncodable, Hashable { public static let integerRule = NumericRule(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil) public static let int32Rule = NumericRule(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil) diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift index 15c2cd2feee..e5db6255169 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct HasOnlyReadOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var foo: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/List.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/List.swift index a35819ac5ee..75c553df8fc 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/List.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/List.swift @@ -7,7 +7,7 @@ import Foundation -public struct List: Sendable, Codable, JSONEncodable, Hashable { +public struct List: Sendable, Codable, QueryStringEncodable, Hashable { public var _123list: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MapTest.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MapTest.swift index be8a35e8fcc..8cc06717f31 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MapTest.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MapTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct MapTest: Sendable, Codable, JSONEncodable, Hashable { +public struct MapTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum MapOfEnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift index 58d90fe83c5..2c7bd6d9c7c 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var uuid: UUID? public var dateTime: Date? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Model200Response.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Model200Response.swift index 550840b8a4c..dfe19e3fdd9 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Model200Response.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Model200Response.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name starting with number */ -public struct Model200Response: Sendable, Codable, JSONEncodable, Hashable { +public struct Model200Response: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int? public var _class: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Name.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Name.swift index db1922fcf11..74c87a00de3 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Name.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Name.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name same as property name */ -public struct Name: Sendable, Codable, JSONEncodable, Hashable { +public struct Name: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int public var snakeCase: Int? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/NumberOnly.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/NumberOnly.swift index f2a25b6f0d2..47d2e318bb5 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/NumberOnly.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/NumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct NumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct NumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var justNumber: Double? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift index c43aac1bb30..2e677b9763d 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift @@ -7,7 +7,7 @@ import Foundation -public struct Order: Sendable, Codable, JSONEncodable, Hashable { +public struct Order: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case placed = "placed" diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/OuterComposite.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/OuterComposite.swift index 9d8a17c8fd2..0a4d002a2dd 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/OuterComposite.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/OuterComposite.swift @@ -7,7 +7,7 @@ import Foundation -public struct OuterComposite: Sendable, Codable, JSONEncodable, Hashable { +public struct OuterComposite: Sendable, Codable, QueryStringEncodable, Hashable { public var myNumber: Double? public var myString: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift index b565e632a3e..15b7f089a74 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift @@ -7,7 +7,7 @@ import Foundation -public struct Pet: Sendable, Codable, JSONEncodable, Hashable { +public struct Pet: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case available = "available" diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ReadOnlyFirst.swift index 5c98c4b1fef..5a06da436f6 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ReadOnlyFirst.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ReadOnlyFirst.swift @@ -7,7 +7,7 @@ import Foundation -public struct ReadOnlyFirst: Sendable, Codable, JSONEncodable, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var baz: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Return.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Return.swift index 261d6d690b8..53ca3f5ad7f 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Return.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Return.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing reserved words */ -public struct Return: Sendable, Codable, JSONEncodable, Hashable { +public struct Return: Sendable, Codable, QueryStringEncodable, Hashable { public var _return: Int? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/SpecialModelName.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/SpecialModelName.swift index d566fc2b6eb..40ad8ff0a05 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/SpecialModelName.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/SpecialModelName.swift @@ -7,7 +7,7 @@ import Foundation -public struct SpecialModelName: Sendable, Codable, JSONEncodable, Hashable { +public struct SpecialModelName: Sendable, Codable, QueryStringEncodable, Hashable { public var specialPropertyName: Int64? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/StringBooleanMap.swift index 847f1e87afd..3bbade9feb7 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/StringBooleanMap.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/StringBooleanMap.swift @@ -7,7 +7,7 @@ import Foundation -public struct StringBooleanMap: Sendable, Codable, JSONEncodable, Hashable { +public struct StringBooleanMap: Sendable, Codable, QueryStringEncodable, Hashable { public enum CodingKeys: CodingKey, CaseIterable { diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift index 514e6abfcee..7c19767a11f 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift @@ -7,7 +7,7 @@ import Foundation -public struct Tag: Sendable, Codable, JSONEncodable, Hashable { +public struct Tag: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderDefault.swift index a3fa21d8cb5..eaaab729500 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderDefault.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderDefault.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderDefault: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderDefault: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String = "what" public var numberItem: Double diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderExample.swift index 9fd4762fe55..bc28c84984a 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderExample.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderExample: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderExample: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String public var numberItem: Double diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift index ecdde64a8d1..e41975d4d66 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift @@ -7,7 +7,7 @@ import Foundation -public struct User: Sendable, Codable, JSONEncodable, Hashable { +public struct User: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/XmlItem.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/XmlItem.swift index afc83421f62..2483cb03e27 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/XmlItem.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/XmlItem.swift @@ -7,7 +7,7 @@ import Foundation -public struct XmlItem: Sendable, Codable, JSONEncodable, Hashable { +public struct XmlItem: Sendable, Codable, QueryStringEncodable, Hashable { public var attributeString: String? public var attributeNumber: Double? diff --git a/samples/client/petstore/swift6/default/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift b/samples/client/petstore/swift6/default/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift index 8d162878dd9..e62c0d14fe1 100644 --- a/samples/client/petstore/swift6/default/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift +++ b/samples/client/petstore/swift6/default/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift @@ -27,7 +27,7 @@ class DateFormatTests: XCTestCase { super.tearDown() } - func testEncodeToJSONAlwaysResultsInUTCEncodedDate() { + func testencodeToQueryStringAlwaysResultsInUTCEncodedDate() { var dateComponents = DateComponents() dateComponents.calendar = Calendar(identifier: .gregorian) dateComponents.year = 2018 @@ -47,7 +47,7 @@ class DateFormatTests: XCTestCase { return } - var encodedDate = utcDate.encodeToJSON(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String + var encodedDate = utcDate.encodeToQueryString(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String XCTAssert(encodedDate.hasSuffix("Z")) // test with a positive timzone offset from UTC @@ -59,7 +59,7 @@ class DateFormatTests: XCTestCase { return } - encodedDate = nonUTCDate1.encodeToJSON(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String + encodedDate = nonUTCDate1.encodeToQueryString(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String XCTAssert(encodedDate.hasSuffix("Z")) // test with a negative timzone offset from UTC @@ -71,7 +71,7 @@ class DateFormatTests: XCTestCase { return } - encodedDate = nonUTCDate2.encodeToJSON(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String + encodedDate = nonUTCDate2.encodeToQueryString(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String XCTAssert(encodedDate.hasSuffix("Z")) } diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift index fdfcfa243f2..455a98457d5 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift @@ -43,7 +43,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeAPI.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeAPI.swift index 74a6a8c69d2..915a19c96a4 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeAPI.swift @@ -41,7 +41,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -84,7 +84,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -127,7 +127,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -170,7 +170,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -213,7 +213,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -257,10 +257,10 @@ import Foundation var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "query": (wrappedValue: query.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "query": (wrappedValue: query.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -305,7 +305,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -375,21 +375,21 @@ import Foundation open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "integer": integer?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int32": int32?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int64": int64?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "number": number.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "float": float?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "double": double.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "string": string?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "pattern_without_delimiter": patternWithoutDelimiter.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "byte": byte.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "binary": binary?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "date": date?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "dateTime": dateTime?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "password": password?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "callback": callback?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "integer": integer?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int32": int32?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int64": int64?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "number": number.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "float": float?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "double": double.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "string": string?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "pattern_without_delimiter": patternWithoutDelimiter.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "byte": byte.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "binary": binary?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "date": date?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "dateTime": dateTime?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "password": password?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "callback": callback?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -397,7 +397,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -519,9 +519,9 @@ import Foundation open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "enum_form_string_array": enumFormStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_form_string": enumFormString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "enum_form_string_array": enumFormStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_form_string": enumFormString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -529,16 +529,16 @@ import Foundation var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_string": (wrappedValue: enumQueryString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string": (wrappedValue: enumQueryString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", - "enum_header_string_array": enumHeaderStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_header_string": enumHeaderString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "enum_header_string_array": enumHeaderStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_header_string": enumHeaderString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -588,19 +588,19 @@ import Foundation open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "required_string_group": (wrappedValue: requiredStringGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "required_int64_group": (wrappedValue: requiredInt64Group.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "string_group": (wrappedValue: stringGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "int64_group": (wrappedValue: int64Group?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_string_group": (wrappedValue: requiredStringGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_int64_group": (wrappedValue: requiredInt64Group.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "string_group": (wrappedValue: stringGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "int64_group": (wrappedValue: int64Group?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ - "required_boolean_group": requiredBooleanGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "boolean_group": booleanGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "required_boolean_group": requiredBooleanGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "boolean_group": booleanGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -643,7 +643,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -685,9 +685,9 @@ import Foundation open class func testJsonFormDataWithRequestBuilder(param: String, param2: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "param": param.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "param2": param2.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "param": param.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "param2": param2.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -695,7 +695,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift index d40d52a2215..dc5b7747c97 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift @@ -46,7 +46,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/PetAPI.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/PetAPI.swift index 4c92f10ded0..ef7aa107f0a 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/PetAPI.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/PetAPI.swift @@ -48,7 +48,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -96,12 +96,12 @@ import Foundation let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ - "api_key": apiKey?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "api_key": apiKey?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -153,14 +153,14 @@ import Foundation open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "status": (wrappedValue: status.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "status": (wrappedValue: status.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -206,14 +206,14 @@ import Foundation open class func findPetsByTagsWithRequestBuilder(tags: [String], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "tags": (wrappedValue: tags.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "tags": (wrappedValue: tags.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -260,11 +260,11 @@ import Foundation let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -311,7 +311,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -361,9 +361,9 @@ import Foundation let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "name": name?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "status": status?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "name": name?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "status": status?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -371,7 +371,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -421,9 +421,9 @@ import Foundation let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "file": file?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "file": file?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -431,7 +431,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] @@ -481,9 +481,9 @@ import Foundation let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "requiredFile": requiredFile.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "requiredFile": requiredFile.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -491,7 +491,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/StoreAPI.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/StoreAPI.swift index 8442b3f9b48..b2131acf27d 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/StoreAPI.swift @@ -42,11 +42,11 @@ import Foundation let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -88,11 +88,11 @@ import Foundation open class func getInventoryWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -136,11 +136,11 @@ import Foundation let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -184,7 +184,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/UserAPI.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/UserAPI.swift index 266a6e6fba4..e73cf4d9c60 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/UserAPI.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/UserAPI.swift @@ -43,7 +43,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -87,7 +87,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -131,7 +131,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -175,11 +175,11 @@ import Foundation let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -222,11 +222,11 @@ import Foundation let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -269,15 +269,15 @@ import Foundation open class func loginUserWithRequestBuilder(username: String, password: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/login" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "username": (wrappedValue: username.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "password": (wrappedValue: password.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "username": (wrappedValue: username.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "password": (wrappedValue: password.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -315,11 +315,11 @@ import Foundation open class func logoutUserWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/logout" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -369,7 +369,7 @@ import Foundation let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIs.swift index 6d50744862b..fadb83874b9 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIs.swift @@ -50,7 +50,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -60,7 +60,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters 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 b4341b60870..7dd50aa2e70 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -9,73 +9,49 @@ import Foundation import FoundationNetworking #endif -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -83,24 +59,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Models.swift index f8e21e4d184..78a06110af5 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Models.swift @@ -9,8 +9,8 @@ import Foundation import FoundationNetworking #endif -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift index a583e24501b..802e927474b 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ public enum HTTPMethod: String { } public protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift index d50a1098405..ff43a426840 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class AdditionalPropertiesClass: NSObject, Codable, JSONEncodable { +@objcMembers public class AdditionalPropertiesClass: NSObject, Codable, QueryStringEncodable { public var mapString: [String: String]? public var mapMapString: [String: [String: String]]? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Animal.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Animal.swift index 5bff0271e9b..d7b9f602323 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Animal.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Animal.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class Animal: NSObject, Codable, JSONEncodable { +@objcMembers public class Animal: NSObject, Codable, QueryStringEncodable { public var _className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ApiResponse.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ApiResponse.swift index cd172879d9b..5e4e0c36d7c 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ApiResponse.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ApiResponse.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class ApiResponse: NSObject, Codable, JSONEncodable { +@objcMembers public class ApiResponse: NSObject, Codable, QueryStringEncodable { public var code: Int? public var codeNum: NSNumber? { diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift index ea461061000..24f978b3acc 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class ArrayOfArrayOfNumberOnly: NSObject, Codable, JSONEncodable { +@objcMembers public class ArrayOfArrayOfNumberOnly: NSObject, Codable, QueryStringEncodable { public var arrayArrayNumber: [[Double]]? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift index c2699042a25..87976a6bc10 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class ArrayOfNumberOnly: NSObject, Codable, JSONEncodable { +@objcMembers public class ArrayOfNumberOnly: NSObject, Codable, QueryStringEncodable { public var arrayNumber: [Double]? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayTest.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayTest.swift index 9ec08c49104..9df6854ecd3 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayTest.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayTest.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class ArrayTest: NSObject, Codable, JSONEncodable { +@objcMembers public class ArrayTest: NSObject, Codable, QueryStringEncodable { public var arrayOfString: [String]? public var arrayArrayOfInteger: [[Int64]]? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Capitalization.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Capitalization.swift index 8790368ff14..2862c6d836e 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Capitalization.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Capitalization.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class Capitalization: NSObject, Codable, JSONEncodable { +@objcMembers public class Capitalization: NSObject, Codable, QueryStringEncodable { public var smallCamel: String? public var capitalCamel: String? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Cat.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Cat.swift index 762473a58f3..7d93c0dd084 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Cat.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Cat.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class Cat: NSObject, Codable, JSONEncodable { +@objcMembers public class Cat: NSObject, Codable, QueryStringEncodable { public var _className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Category.swift index 5c70f7f2231..8801788d3b7 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Category.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class Category: NSObject, Codable, JSONEncodable { +@objcMembers public class Category: NSObject, Codable, QueryStringEncodable { public var _id: Int64? public var _idNum: NSNumber? { diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ClassModel.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ClassModel.swift index ad360b79279..42274044f19 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ClassModel.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ClassModel.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model with \"_class\" property */ -@objcMembers public class ClassModel: NSObject, Codable, JSONEncodable { +@objcMembers public class ClassModel: NSObject, Codable, QueryStringEncodable { public var _class: String? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Client.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Client.swift index 46bb6353395..c6140e4e15e 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Client.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Client.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class Client: NSObject, Codable, JSONEncodable { +@objcMembers public class Client: NSObject, Codable, QueryStringEncodable { public var client: String? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Dog.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Dog.swift index 049b33f251b..32f8957fe73 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Dog.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Dog.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class Dog: NSObject, Codable, JSONEncodable { +@objcMembers public class Dog: NSObject, Codable, QueryStringEncodable { public var _className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumArrays.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumArrays.swift index 78fcc4a1677..53d96d689f6 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumArrays.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumArrays.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class EnumArrays: NSObject, Codable, JSONEncodable { +@objcMembers public class EnumArrays: NSObject, Codable, QueryStringEncodable { public enum JustSymbol: String, Sendable, Codable, CaseIterable { case greaterThanOrEqualTo = ">=" diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumTest.swift index a5c78ff1ae0..42043815934 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumTest.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class EnumTest: NSObject, Codable, JSONEncodable { +@objcMembers public class EnumTest: NSObject, Codable, QueryStringEncodable { public enum EnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/File.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/File.swift index c04390551de..16d025d2d12 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/File.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/File.swift @@ -8,7 +8,7 @@ import Foundation /** Must be named `File` for test. */ -@objcMembers public class File: NSObject, Codable, JSONEncodable { +@objcMembers public class File: NSObject, Codable, QueryStringEncodable { /** Test capitalization */ public var sourceURI: String? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FileSchemaTestClass.swift index 7c959dec0af..0761749c34b 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FileSchemaTestClass.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FileSchemaTestClass.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class FileSchemaTestClass: NSObject, Codable, JSONEncodable { +@objcMembers public class FileSchemaTestClass: NSObject, Codable, QueryStringEncodable { public var file: File? public var files: [File]? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FormatTest.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FormatTest.swift index 601d5f418ad..c0e14f2e063 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FormatTest.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FormatTest.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class FormatTest: NSObject, Codable, JSONEncodable { +@objcMembers public class FormatTest: NSObject, Codable, QueryStringEncodable { public static let integerRule = NumericRule(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil) public static let int32Rule = NumericRule(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil) diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift index 6f77912ffd7..fde651257f9 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class HasOnlyReadOnly: NSObject, Codable, JSONEncodable { +@objcMembers public class HasOnlyReadOnly: NSObject, Codable, QueryStringEncodable { public var bar: String? public var foo: String? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/List.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/List.swift index 24d35593da8..ac9b2ddf867 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/List.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/List.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class List: NSObject, Codable, JSONEncodable { +@objcMembers public class List: NSObject, Codable, QueryStringEncodable { public var _123list: String? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MapTest.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MapTest.swift index 886093a41ee..1d9d0ad9324 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MapTest.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MapTest.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class MapTest: NSObject, Codable, JSONEncodable { +@objcMembers public class MapTest: NSObject, Codable, QueryStringEncodable { public enum MapOfEnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift index a72e234c4f5..f566d6af688 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class MixedPropertiesAndAdditionalPropertiesClass: NSObject, Codable, JSONEncodable { +@objcMembers public class MixedPropertiesAndAdditionalPropertiesClass: NSObject, Codable, QueryStringEncodable { public var uuid: UUID? public var dateTime: Date? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Model200Response.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Model200Response.swift index 4eb5580876d..37c35576bf1 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Model200Response.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Model200Response.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name starting with number */ -@objcMembers public class Model200Response: NSObject, Codable, JSONEncodable { +@objcMembers public class Model200Response: NSObject, Codable, QueryStringEncodable { public var name: Int? public var nameNum: NSNumber? { diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Name.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Name.swift index 1e6508489c1..9c783ca1852 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Name.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Name.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name same as property name */ -@objcMembers public class Name: NSObject, Codable, JSONEncodable { +@objcMembers public class Name: NSObject, Codable, QueryStringEncodable { public var name: Int public var snakeCase: NullEncodable = .encodeValue(11033) diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/NumberOnly.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/NumberOnly.swift index 30fd8c4bf7a..4a019233c1a 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/NumberOnly.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/NumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class NumberOnly: NSObject, Codable, JSONEncodable { +@objcMembers public class NumberOnly: NSObject, Codable, QueryStringEncodable { public var justNumber: Double? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Order.swift index 5f2639ac740..8b9ca0f6b3d 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Order.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class Order: NSObject, Codable, JSONEncodable { +@objcMembers public class Order: NSObject, Codable, QueryStringEncodable { public enum Status: String, Sendable, Codable, CaseIterable { case placed = "placed" diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterComposite.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterComposite.swift index ae0e069c09b..8ef5bf31360 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterComposite.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterComposite.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class OuterComposite: NSObject, Codable, JSONEncodable { +@objcMembers public class OuterComposite: NSObject, Codable, QueryStringEncodable { public var myNumber: Double? public var myString: String? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Pet.swift index 4ed259411f7..fc85d0a3516 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Pet.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class Pet: NSObject, Codable, JSONEncodable { +@objcMembers public class Pet: NSObject, Codable, QueryStringEncodable { public enum Status: String, Sendable, Codable, CaseIterable { case available = "available" diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ReadOnlyFirst.swift index baca695f586..e80c59d3273 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ReadOnlyFirst.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ReadOnlyFirst.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class ReadOnlyFirst: NSObject, Codable, JSONEncodable { +@objcMembers public class ReadOnlyFirst: NSObject, Codable, QueryStringEncodable { public var bar: String? public var baz: String? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Return.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Return.swift index 46ca1bb6cf4..2fd051f925e 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Return.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Return.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing reserved words */ -@objcMembers public class Return: NSObject, Codable, JSONEncodable { +@objcMembers public class Return: NSObject, Codable, QueryStringEncodable { public var _return: Int? public var _returnNum: NSNumber? { diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/SpecialModelName.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/SpecialModelName.swift index e2edd5a86a4..bce626c79e7 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/SpecialModelName.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/SpecialModelName.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class SpecialModelName: NSObject, Codable, JSONEncodable { +@objcMembers public class SpecialModelName: NSObject, Codable, QueryStringEncodable { public var specialPropertyName: Int64? public var specialPropertyNameNum: NSNumber? { diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/StringBooleanMap.swift index d840e30d767..de0825caaee 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/StringBooleanMap.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/StringBooleanMap.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class StringBooleanMap: NSObject, Codable, JSONEncodable { +@objcMembers public class StringBooleanMap: NSObject, Codable, QueryStringEncodable { public enum CodingKeys: CodingKey, CaseIterable { diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Tag.swift index 20db10fe34d..f7670114e76 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Tag.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class Tag: NSObject, Codable, JSONEncodable { +@objcMembers public class Tag: NSObject, Codable, QueryStringEncodable { public var _id: Int64? public var _idNum: NSNumber? { diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderDefault.swift index cf70b1888bc..093c4131d0c 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderDefault.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderDefault.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class TypeHolderDefault: NSObject, Codable, JSONEncodable { +@objcMembers public class TypeHolderDefault: NSObject, Codable, QueryStringEncodable { public var stringItem: String = "what" public var numberItem: Double diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderExample.swift index 544bf61e10e..406aa05eba2 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderExample.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class TypeHolderExample: NSObject, Codable, JSONEncodable { +@objcMembers public class TypeHolderExample: NSObject, Codable, QueryStringEncodable { public var stringItem: String public var numberItem: Double diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/User.swift index 30c92e4b9b8..4ad13fce234 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/User.swift @@ -7,7 +7,7 @@ import Foundation -@objcMembers public class User: NSObject, Codable, JSONEncodable { +@objcMembers public class User: NSObject, Codable, QueryStringEncodable { public var _id: Int64? public var _idNum: NSNumber? { diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift index f54ce791f8d..6d4dd039659 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift @@ -34,11 +34,11 @@ open class DefaultAPI { open class func rootGetWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 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 @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift index b90f3e44644..559bee34ffc 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift @@ -50,7 +50,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -60,7 +60,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters 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 b4341b60870..7dd50aa2e70 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,73 +9,49 @@ import Foundation import FoundationNetworking #endif -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -83,24 +59,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index f8e21e4d184..78a06110af5 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -9,8 +9,8 @@ import Foundation import FoundationNetworking #endif -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift index a583e24501b..802e927474b 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ public enum HTTPMethod: String { } public protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Apple.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Apple.swift index f3db65a4ffc..b5f9dab002a 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Apple.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Apple.swift @@ -7,7 +7,7 @@ import Foundation -public struct Apple: Sendable, Codable, JSONEncodable, Hashable { +public struct Apple: Sendable, Codable, QueryStringEncodable, Hashable { public var kind: String? diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Banana.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Banana.swift index 4ba29ce3bae..fa52f03497f 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Banana.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Banana.swift @@ -7,7 +7,7 @@ import Foundation -public struct Banana: Sendable, Codable, JSONEncodable, Hashable { +public struct Banana: Sendable, Codable, QueryStringEncodable, Hashable { public var count: Double? diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Fruit.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Fruit.swift index 1a7f7cc3695..bff766489aa 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Fruit.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Fruit.swift @@ -7,7 +7,7 @@ import Foundation -public enum Fruit: Sendable, Codable, JSONEncodable, Hashable { +public enum Fruit: Sendable, Codable, QueryStringEncodable, Hashable { case typeApple(Apple) case typeBanana(Banana) diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index b8871945b90..b3d38a4b696 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -45,7 +45,7 @@ open class AnotherFakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index 59c692cfff3..3b2dbbfd0cd 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -43,7 +43,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -87,7 +87,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -131,7 +131,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -175,7 +175,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -219,7 +219,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -264,10 +264,10 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "query": (wrappedValue: query.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "query": (wrappedValue: query.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -313,7 +313,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -384,21 +384,21 @@ open class FakeAPI { open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "integer": integer?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int32": int32?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int64": int64?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "number": number.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "float": float?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "double": double.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "string": string?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "pattern_without_delimiter": patternWithoutDelimiter.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "byte": byte.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "binary": binary?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "date": date?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "dateTime": dateTime?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "password": password?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "callback": callback?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "integer": integer?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int32": int32?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int64": int64?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "number": number.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "float": float?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "double": double.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "string": string?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "pattern_without_delimiter": patternWithoutDelimiter.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "byte": byte.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "binary": binary?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "date": date?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "dateTime": dateTime?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "password": password?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "callback": callback?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -406,7 +406,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -529,9 +529,9 @@ open class FakeAPI { open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "enum_form_string_array": enumFormStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_form_string": enumFormString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "enum_form_string_array": enumFormStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_form_string": enumFormString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -539,16 +539,16 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_string": (wrappedValue: enumQueryString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string": (wrappedValue: enumQueryString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", - "enum_header_string_array": enumHeaderStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_header_string": enumHeaderString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "enum_header_string_array": enumHeaderStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_header_string": enumHeaderString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -599,19 +599,19 @@ open class FakeAPI { open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "required_string_group": (wrappedValue: requiredStringGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "required_int64_group": (wrappedValue: requiredInt64Group.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "string_group": (wrappedValue: stringGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "int64_group": (wrappedValue: int64Group?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_string_group": (wrappedValue: requiredStringGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_int64_group": (wrappedValue: requiredInt64Group.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "string_group": (wrappedValue: stringGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "int64_group": (wrappedValue: int64Group?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ - "required_boolean_group": requiredBooleanGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "boolean_group": booleanGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "required_boolean_group": requiredBooleanGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "boolean_group": booleanGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -655,7 +655,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -698,9 +698,9 @@ open class FakeAPI { open class func testJsonFormDataWithRequestBuilder(param: String, param2: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "param": param.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "param2": param2.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "param": param.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "param2": param2.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -708,7 +708,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index 191d0d8e714..9c34abfc1b2 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -48,7 +48,7 @@ open class FakeClassnameTags123API { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index 70a70536c34..f862792ac8f 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -50,7 +50,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -99,12 +99,12 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ - "api_key": apiKey?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "api_key": apiKey?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -157,14 +157,14 @@ open class PetAPI { open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "status": (wrappedValue: status.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "status": (wrappedValue: status.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -211,14 +211,14 @@ open class PetAPI { open class func findPetsByTagsWithRequestBuilder(tags: [String], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "tags": (wrappedValue: tags.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "tags": (wrappedValue: tags.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -266,11 +266,11 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -318,7 +318,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -369,9 +369,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "name": name?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "status": status?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "name": name?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "status": status?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -379,7 +379,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -430,9 +430,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "file": file?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "file": file?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -440,7 +440,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] @@ -491,9 +491,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "requiredFile": requiredFile.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "requiredFile": requiredFile.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -501,7 +501,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index b63faef30a6..119f59d76e3 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -44,11 +44,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -91,11 +91,11 @@ open class StoreAPI { open class func getInventoryWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -140,11 +140,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -189,7 +189,7 @@ open class StoreAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index b7a818894c8..be766b2c5e4 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -45,7 +45,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -90,7 +90,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -135,7 +135,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -180,11 +180,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -228,11 +228,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -276,15 +276,15 @@ open class UserAPI { open class func loginUserWithRequestBuilder(username: String, password: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/login" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "username": (wrappedValue: username.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "password": (wrappedValue: password.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "username": (wrappedValue: username.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "password": (wrappedValue: password.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -323,11 +323,11 @@ open class UserAPI { open class func logoutUserWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/logout" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -378,7 +378,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 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 @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift index 6d50744862b..fadb83874b9 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift @@ -50,7 +50,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -60,7 +60,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters 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 695a1bc866f..0f92498171e 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,73 +10,49 @@ import FoundationNetworking #endif @preconcurrency import PromiseKit -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -84,24 +60,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index f8e21e4d184..78a06110af5 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -9,8 +9,8 @@ import Foundation import FoundationNetworking #endif -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift index a583e24501b..802e927474b 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ public enum HTTPMethod: String { } public protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift index ca940fd8662..9bd081f7d00 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var mapString: [String: String]? public var mapMapString: [String: [String: String]]? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift index c8a6f210c55..b20104e0503 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift @@ -7,7 +7,7 @@ import Foundation -public struct Animal: Sendable, Codable, JSONEncodable, Hashable { +public struct Animal: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift index a8d7a4a1423..cea25ea52e2 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift @@ -7,7 +7,7 @@ import Foundation -public struct ApiResponse: Sendable, Codable, JSONEncodable, Hashable { +public struct ApiResponse: Sendable, Codable, QueryStringEncodable, Hashable { public var code: Int? public var type: String? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift index e569ab1877e..679279d61cb 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayArrayNumber: [[Double]]? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift index 2dd67b1cb58..d71bd4e40b7 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayNumber: [Double]? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift index 21943123d9e..839795229bb 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayTest: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayTest: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayOfString: [String]? public var arrayArrayOfInteger: [[Int64]]? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift index 55de9b34a29..56100523e84 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift @@ -7,7 +7,7 @@ import Foundation -public struct Capitalization: Sendable, Codable, JSONEncodable, Hashable { +public struct Capitalization: Sendable, Codable, QueryStringEncodable, Hashable { public var smallCamel: String? public var capitalCamel: String? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift index 80ff359c186..cceeddd1bf9 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift @@ -7,7 +7,7 @@ import Foundation -public struct Cat: Sendable, Codable, JSONEncodable, Hashable { +public struct Cat: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift index d1cceeccfe8..c04a9e673cf 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift @@ -7,7 +7,7 @@ import Foundation -public struct Category: Sendable, Codable, JSONEncodable, Hashable { +public struct Category: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? = "default-name" diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift index 45546a7b33f..4c1e9c1a990 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model with \"_class\" property */ -public struct ClassModel: Sendable, Codable, JSONEncodable, Hashable { +public struct ClassModel: Sendable, Codable, QueryStringEncodable, Hashable { public var _class: String? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift index e6792283509..b49ded4cc5c 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift @@ -7,7 +7,7 @@ import Foundation -public struct Client: Sendable, Codable, JSONEncodable, Hashable { +public struct Client: Sendable, Codable, QueryStringEncodable, Hashable { public var client: String? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift index 9cb18da8a57..99231ca03f7 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift @@ -7,7 +7,7 @@ import Foundation -public struct Dog: Sendable, Codable, JSONEncodable, Hashable { +public struct Dog: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift index a8f557dfc8e..09bbcb9f280 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumArrays: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumArrays: Sendable, Codable, QueryStringEncodable, Hashable { public enum JustSymbol: String, Sendable, Codable, CaseIterable { case greaterThanOrEqualTo = ">=" diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 298f93c69bd..d280112e88b 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumTest: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum EnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift index 989bc5d0837..c35e1b2d53a 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift @@ -8,7 +8,7 @@ import Foundation /** Must be named `File` for test. */ -public struct File: Sendable, Codable, JSONEncodable, Hashable { +public struct File: Sendable, Codable, QueryStringEncodable, Hashable { /** Test capitalization */ public var sourceURI: String? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift index 4e7e54f8ca2..6ca430a91ba 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct FileSchemaTestClass: Sendable, Codable, JSONEncodable, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, QueryStringEncodable, Hashable { public var file: File? public var files: [File]? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift index 3bfc12535c3..427b85e7fd9 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct FormatTest: Sendable, Codable, JSONEncodable, Hashable { +public struct FormatTest: Sendable, Codable, QueryStringEncodable, Hashable { public static let integerRule = NumericRule(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil) public static let int32Rule = NumericRule(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil) diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift index 15c2cd2feee..e5db6255169 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct HasOnlyReadOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var foo: String? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift index a35819ac5ee..75c553df8fc 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift @@ -7,7 +7,7 @@ import Foundation -public struct List: Sendable, Codable, JSONEncodable, Hashable { +public struct List: Sendable, Codable, QueryStringEncodable, Hashable { public var _123list: String? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift index be8a35e8fcc..8cc06717f31 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct MapTest: Sendable, Codable, JSONEncodable, Hashable { +public struct MapTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum MapOfEnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift index 58d90fe83c5..2c7bd6d9c7c 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var uuid: UUID? public var dateTime: Date? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift index 550840b8a4c..dfe19e3fdd9 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name starting with number */ -public struct Model200Response: Sendable, Codable, JSONEncodable, Hashable { +public struct Model200Response: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int? public var _class: String? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift index b72dd32ecba..d0a98e0980b 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name same as property name */ -public struct Name: Sendable, Codable, JSONEncodable, Hashable { +public struct Name: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int public var snakeCase: NullEncodable = .encodeValue(11033) diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift index f2a25b6f0d2..47d2e318bb5 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct NumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct NumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var justNumber: Double? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift index 9bc6ecf183e..6a9ecc5540c 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift @@ -7,7 +7,7 @@ import Foundation -public struct Order: Sendable, Codable, JSONEncodable, Hashable { +public struct Order: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case placed = "placed" diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift index 9d8a17c8fd2..0a4d002a2dd 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift @@ -7,7 +7,7 @@ import Foundation -public struct OuterComposite: Sendable, Codable, JSONEncodable, Hashable { +public struct OuterComposite: Sendable, Codable, QueryStringEncodable, Hashable { public var myNumber: Double? public var myString: String? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift index b1ccb862d1a..302a3052c6e 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift @@ -7,7 +7,7 @@ import Foundation -public struct Pet: Sendable, Codable, JSONEncodable, Hashable { +public struct Pet: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case available = "available" diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift index 5c98c4b1fef..5a06da436f6 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift @@ -7,7 +7,7 @@ import Foundation -public struct ReadOnlyFirst: Sendable, Codable, JSONEncodable, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var baz: String? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift index 261d6d690b8..53ca3f5ad7f 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing reserved words */ -public struct Return: Sendable, Codable, JSONEncodable, Hashable { +public struct Return: Sendable, Codable, QueryStringEncodable, Hashable { public var _return: Int? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift index d566fc2b6eb..40ad8ff0a05 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift @@ -7,7 +7,7 @@ import Foundation -public struct SpecialModelName: Sendable, Codable, JSONEncodable, Hashable { +public struct SpecialModelName: Sendable, Codable, QueryStringEncodable, Hashable { public var specialPropertyName: Int64? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift index 847f1e87afd..3bbade9feb7 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift @@ -7,7 +7,7 @@ import Foundation -public struct StringBooleanMap: Sendable, Codable, JSONEncodable, Hashable { +public struct StringBooleanMap: Sendable, Codable, QueryStringEncodable, Hashable { public enum CodingKeys: CodingKey, CaseIterable { diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift index 514e6abfcee..7c19767a11f 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift @@ -7,7 +7,7 @@ import Foundation -public struct Tag: Sendable, Codable, JSONEncodable, Hashable { +public struct Tag: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift index a3fa21d8cb5..eaaab729500 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderDefault: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderDefault: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String = "what" public var numberItem: Double diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift index 6102e9a3726..bac80c4fcd2 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderExample: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderExample: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String public var numberItem: Double diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift index ecdde64a8d1..e41975d4d66 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift @@ -7,7 +7,7 @@ import Foundation -public struct User: Sendable, Codable, JSONEncodable, Hashable { +public struct User: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index 6dc3758016a..301d4a4be28 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -43,7 +43,7 @@ internal class AnotherFakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index d0064620da3..c531bf4a1f7 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -41,7 +41,7 @@ internal class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -84,7 +84,7 @@ internal class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -127,7 +127,7 @@ internal class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -170,7 +170,7 @@ internal class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -213,7 +213,7 @@ internal class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -257,10 +257,10 @@ internal class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "query": (wrappedValue: query.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "query": (wrappedValue: query.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -305,7 +305,7 @@ internal class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -375,21 +375,21 @@ internal class FakeAPI { internal class func testEndpointParametersWithRequestBuilder(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double, string: String? = nil, patternWithoutDelimiter: String, byte: Data, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "integer": integer?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int32": int32?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int64": int64?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "number": number.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "float": float?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "double": double.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "string": string?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "pattern_without_delimiter": patternWithoutDelimiter.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "byte": byte.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "binary": binary?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "date": date?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "dateTime": dateTime?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "password": password?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "callback": callback?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "integer": integer?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int32": int32?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int64": int64?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "number": number.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "float": float?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "double": double.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "string": string?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "pattern_without_delimiter": patternWithoutDelimiter.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "byte": byte.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "binary": binary?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "date": date?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "dateTime": dateTime?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "password": password?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "callback": callback?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -397,7 +397,7 @@ internal class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -519,9 +519,9 @@ internal class FakeAPI { internal class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "enum_form_string_array": enumFormStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_form_string": enumFormString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "enum_form_string_array": enumFormStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_form_string": enumFormString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -529,16 +529,16 @@ internal class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_string": (wrappedValue: enumQueryString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string": (wrappedValue: enumQueryString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", - "enum_header_string_array": enumHeaderStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_header_string": enumHeaderString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "enum_header_string_array": enumHeaderStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_header_string": enumHeaderString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -588,19 +588,19 @@ internal class FakeAPI { internal class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "required_string_group": (wrappedValue: requiredStringGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "required_int64_group": (wrappedValue: requiredInt64Group.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "string_group": (wrappedValue: stringGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "int64_group": (wrappedValue: int64Group?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_string_group": (wrappedValue: requiredStringGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_int64_group": (wrappedValue: requiredInt64Group.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "string_group": (wrappedValue: stringGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "int64_group": (wrappedValue: int64Group?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ - "required_boolean_group": requiredBooleanGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "boolean_group": booleanGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "required_boolean_group": requiredBooleanGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "boolean_group": booleanGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -643,7 +643,7 @@ internal class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -685,9 +685,9 @@ internal class FakeAPI { internal class func testJsonFormDataWithRequestBuilder(param: String, param2: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "param": param.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "param2": param2.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "param": param.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "param2": param2.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -695,7 +695,7 @@ internal class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index 97139dcc514..fe035499f45 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -46,7 +46,7 @@ internal class FakeClassnameTags123API { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index 1475d275a19..524b1f4b5ac 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -48,7 +48,7 @@ internal class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -96,12 +96,12 @@ internal class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ - "api_key": apiKey?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "api_key": apiKey?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -153,14 +153,14 @@ internal class PetAPI { internal class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "status": (wrappedValue: status.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "status": (wrappedValue: status.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -206,14 +206,14 @@ internal class PetAPI { internal class func findPetsByTagsWithRequestBuilder(tags: [String], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "tags": (wrappedValue: tags.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "tags": (wrappedValue: tags.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -260,11 +260,11 @@ internal class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -311,7 +311,7 @@ internal class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -361,9 +361,9 @@ internal class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "name": name?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "status": status?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "name": name?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "status": status?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -371,7 +371,7 @@ internal class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -421,9 +421,9 @@ internal class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "file": file?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "file": file?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -431,7 +431,7 @@ internal class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] @@ -481,9 +481,9 @@ internal class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "requiredFile": requiredFile.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "requiredFile": requiredFile.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -491,7 +491,7 @@ internal class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index 147a4620c07..0f647d44733 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -42,11 +42,11 @@ internal class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -88,11 +88,11 @@ internal class StoreAPI { internal class func getInventoryWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -136,11 +136,11 @@ internal class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -184,7 +184,7 @@ internal class StoreAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index 3dd0982cc86..51ff300b334 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -43,7 +43,7 @@ internal class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -87,7 +87,7 @@ internal class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -131,7 +131,7 @@ internal class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -175,11 +175,11 @@ internal class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -222,11 +222,11 @@ internal class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -269,15 +269,15 @@ internal class UserAPI { internal class func loginUserWithRequestBuilder(username: String, password: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/login" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "username": (wrappedValue: username.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "password": (wrappedValue: password.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "username": (wrappedValue: username.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "password": (wrappedValue: password.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -315,11 +315,11 @@ internal class UserAPI { internal class func logoutUserWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/logout" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -369,7 +369,7 @@ internal class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 cf437d75dec..8e370c7ae8c 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 @@ -7,8 +7,8 @@ import Foundation internal struct APIHelper { - internal static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + internal static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ internal struct APIHelper { return destination } - internal static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + internal static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ internal struct APIHelper { } } - internal static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + internal static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ internal struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - internal static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + internal static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift index 58919a74bec..27a4208a0b9 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift @@ -50,7 +50,7 @@ internal class PetstoreClientAPIConfiguration: @unchecked Sendable { internal class RequestBuilder: @unchecked Sendable { internal var credential: URLCredential? internal var headers: [String: String] - internal let parameters: [String: Any]? + internal let parameters: [String: any Sendable]? internal let method: String internal let URLString: String internal let requestTask: RequestTask = RequestTask() @@ -60,7 +60,7 @@ internal class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. internal var onProgressReady: ((Progress) -> Void)? - required internal init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required internal init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters 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 e59acd126f0..cc672834f6b 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,73 +9,49 @@ import Foundation import FoundationNetworking #endif -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -83,24 +59,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift index ad2d3e175a7..5f22f0d3d48 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -internal struct JSONDataEncoding { +internal struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ internal struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - internal func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + internal func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ internal struct JSONDataEncoding { return urlRequest } - internal static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + internal static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift index 34e6d115035..208ee2c917e 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation internal class JSONEncodingHelper { - internal class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + internal class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ internal class JSONEncodingHelper { return params } - internal class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + internal class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index d6e95fffc23..f763f8d092a 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -9,8 +9,8 @@ import Foundation import FoundationNetworking #endif -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift index 99cdd86d446..d787d429b31 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { internal class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required internal init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required internal init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ internal class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendab originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ internal enum HTTPMethod: String { } internal protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift index b9c18119b07..cd94c1658ac 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -internal struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable { +internal struct AdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable { internal private(set) var mapString: [String: String]? internal private(set) var mapMapString: [String: [String: String]]? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift index 26376b14842..f299bddbadc 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift @@ -7,7 +7,7 @@ import Foundation -internal struct Animal: Sendable, Codable, JSONEncodable { +internal struct Animal: Sendable, Codable, QueryStringEncodable { internal private(set) var className: String internal private(set) var color: String? = "red" diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift index 8998f2611b1..eea24b50519 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift @@ -7,7 +7,7 @@ import Foundation -internal struct ApiResponse: Sendable, Codable, JSONEncodable { +internal struct ApiResponse: Sendable, Codable, QueryStringEncodable { internal private(set) var code: Int? internal private(set) var type: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift index 368bb5edb10..2206e28fb94 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -internal struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable { +internal struct ArrayOfArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable { internal private(set) var arrayArrayNumber: [[Double]]? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift index fd16cccaacf..3f93ba4a0bb 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -internal struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable { +internal struct ArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable { internal private(set) var arrayNumber: [Double]? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift index 339019fb23c..dbd72e91db2 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift @@ -7,7 +7,7 @@ import Foundation -internal struct ArrayTest: Sendable, Codable, JSONEncodable { +internal struct ArrayTest: Sendable, Codable, QueryStringEncodable { internal private(set) var arrayOfString: [String]? internal private(set) var arrayArrayOfInteger: [[Int64]]? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift index fc83bf28616..981a4637676 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift @@ -7,7 +7,7 @@ import Foundation -internal struct Capitalization: Sendable, Codable, JSONEncodable { +internal struct Capitalization: Sendable, Codable, QueryStringEncodable { internal private(set) var smallCamel: String? internal private(set) var capitalCamel: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift index b409e030e1e..2294c0d3e80 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift @@ -7,7 +7,7 @@ import Foundation -internal struct Cat: Sendable, Codable, JSONEncodable { +internal struct Cat: Sendable, Codable, QueryStringEncodable { internal private(set) var className: String internal private(set) var color: String? = "red" diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift index 5c9c88fb0c4..f4c349f77cc 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift @@ -7,7 +7,7 @@ import Foundation -internal struct Category: Sendable, Codable, JSONEncodable, Hashable { +internal struct Category: Sendable, Codable, QueryStringEncodable, Hashable { internal private(set) var id: Int64? internal private(set) var name: String? = "default-name" diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift index a11bd47d200..d45977632ce 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model with \"_class\" property */ -internal struct ClassModel: Sendable, Codable, JSONEncodable { +internal struct ClassModel: Sendable, Codable, QueryStringEncodable { internal private(set) var _class: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift index 33be3be2275..ae658e54f3f 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift @@ -7,7 +7,7 @@ import Foundation -internal struct Client: Sendable, Codable, JSONEncodable { +internal struct Client: Sendable, Codable, QueryStringEncodable { internal private(set) var client: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift index 56383b31452..2c3e6c61391 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift @@ -7,7 +7,7 @@ import Foundation -internal struct Dog: Sendable, Codable, JSONEncodable { +internal struct Dog: Sendable, Codable, QueryStringEncodable { internal private(set) var className: String internal private(set) var color: String? = "red" diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift index 5e0b3fb9179..1174d2f1a3c 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift @@ -7,7 +7,7 @@ import Foundation -internal struct EnumArrays: Sendable, Codable, JSONEncodable { +internal struct EnumArrays: Sendable, Codable, QueryStringEncodable { internal enum JustSymbol: String, Sendable, Codable, CaseIterable, CaseIterableDefaultsLast { case greaterThanOrEqualTo = ">=" diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index a08dd30dfde..3dfc4d8208a 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -7,7 +7,7 @@ import Foundation -internal struct EnumTest: Sendable, Codable, JSONEncodable { +internal struct EnumTest: Sendable, Codable, QueryStringEncodable { internal enum EnumString: String, Sendable, Codable, CaseIterable, CaseIterableDefaultsLast { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift index c9eb864c181..4d49a28ba51 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift @@ -8,7 +8,7 @@ import Foundation /** Must be named `File` for test. */ -internal struct File: Sendable, Codable, JSONEncodable { +internal struct File: Sendable, Codable, QueryStringEncodable { /** Test capitalization */ internal private(set) var sourceURI: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift index 67be65f54c9..dde036f6806 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift @@ -7,7 +7,7 @@ import Foundation -internal struct FileSchemaTestClass: Sendable, Codable, JSONEncodable { +internal struct FileSchemaTestClass: Sendable, Codable, QueryStringEncodable { internal private(set) var file: File? internal private(set) var files: [File]? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift index 6cc1faba022..eeb7c62f70a 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift @@ -7,7 +7,7 @@ import Foundation -internal struct FormatTest: Sendable, Codable, JSONEncodable { +internal struct FormatTest: Sendable, Codable, QueryStringEncodable { internal static let integerRule = NumericRule(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil) internal static let int32Rule = NumericRule(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil) diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift index 3c02c176c9e..90dff39f23f 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift @@ -7,7 +7,7 @@ import Foundation -internal struct HasOnlyReadOnly: Sendable, Codable, JSONEncodable { +internal struct HasOnlyReadOnly: Sendable, Codable, QueryStringEncodable { internal private(set) var bar: String? internal private(set) var foo: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift index f72f4f2f143..0f9fdf3b123 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift @@ -7,7 +7,7 @@ import Foundation -internal struct List: Sendable, Codable, JSONEncodable { +internal struct List: Sendable, Codable, QueryStringEncodable { internal private(set) var _123list: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift index cc88bac4d9e..db519aeb1d2 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift @@ -7,7 +7,7 @@ import Foundation -internal struct MapTest: Sendable, Codable, JSONEncodable { +internal struct MapTest: Sendable, Codable, QueryStringEncodable { internal enum MapOfEnumString: String, Sendable, Codable, CaseIterable, CaseIterableDefaultsLast { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift index 97b8d16e8ab..34b7bce4cce 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -internal struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, JSONEncodable { +internal struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable { internal private(set) var uuid: UUID? internal private(set) var dateTime: Date? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift index ac4d9dae9d7..91f96443c27 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name starting with number */ -internal struct Model200Response: Sendable, Codable, JSONEncodable { +internal struct Model200Response: Sendable, Codable, QueryStringEncodable { internal private(set) var name: Int? internal private(set) var _class: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift index 9d5506f3346..a21abc0e071 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name same as property name */ -internal struct Name: Sendable, Codable, JSONEncodable { +internal struct Name: Sendable, Codable, QueryStringEncodable { internal private(set) var name: Int internal private(set) var snakeCase: NullEncodable = .encodeValue(11033) diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift index 4c75ffa4f76..c229a50c78a 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -internal struct NumberOnly: Sendable, Codable, JSONEncodable { +internal struct NumberOnly: Sendable, Codable, QueryStringEncodable { internal private(set) var justNumber: Double? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift index f9b6aa26da1..64841139f24 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift @@ -7,7 +7,7 @@ import Foundation -internal struct Order: Sendable, Codable, JSONEncodable { +internal struct Order: Sendable, Codable, QueryStringEncodable { internal enum Status: String, Sendable, Codable, CaseIterable, CaseIterableDefaultsLast { case placed = "placed" diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift index 75c7b31a26b..e85a44fa9d4 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift @@ -7,7 +7,7 @@ import Foundation -internal struct OuterComposite: Sendable, Codable, JSONEncodable { +internal struct OuterComposite: Sendable, Codable, QueryStringEncodable { internal private(set) var myNumber: Double? internal private(set) var myString: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift index 72d0aa87c80..91a8ef34143 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift @@ -7,7 +7,7 @@ import Foundation -internal struct Pet: Sendable, Codable, JSONEncodable, Hashable { +internal struct Pet: Sendable, Codable, QueryStringEncodable, Hashable { internal enum Status: String, Sendable, Codable, CaseIterable, CaseIterableDefaultsLast { case available = "available" diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift index d58d48fa45a..77b1973aa42 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift @@ -7,7 +7,7 @@ import Foundation -internal struct ReadOnlyFirst: Sendable, Codable, JSONEncodable { +internal struct ReadOnlyFirst: Sendable, Codable, QueryStringEncodable { internal private(set) var bar: String? internal private(set) var baz: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift index 34bac69a928..e2efcf5c4ec 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing reserved words */ -internal struct Return: Sendable, Codable, JSONEncodable { +internal struct Return: Sendable, Codable, QueryStringEncodable { internal private(set) var _return: Int? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift index c174724d785..3254476d018 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift @@ -7,7 +7,7 @@ import Foundation -internal struct SpecialModelName: Sendable, Codable, JSONEncodable { +internal struct SpecialModelName: Sendable, Codable, QueryStringEncodable { internal private(set) var specialPropertyName: Int64? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift index 2605f30a1ea..6e900ea2933 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift @@ -7,7 +7,7 @@ import Foundation -internal struct StringBooleanMap: Sendable, Codable, JSONEncodable { +internal struct StringBooleanMap: Sendable, Codable, QueryStringEncodable { internal enum CodingKeys: CodingKey, CaseIterable { diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift index 5f5a08c4334..1b2844889e1 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift @@ -7,7 +7,7 @@ import Foundation -internal struct Tag: Sendable, Codable, JSONEncodable, Hashable { +internal struct Tag: Sendable, Codable, QueryStringEncodable, Hashable { internal private(set) var id: Int64? internal private(set) var name: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift index 25fd11fa582..565dffc3983 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift @@ -7,7 +7,7 @@ import Foundation -internal struct TypeHolderDefault: Sendable, Codable, JSONEncodable { +internal struct TypeHolderDefault: Sendable, Codable, QueryStringEncodable { internal private(set) var stringItem: String = "what" internal private(set) var numberItem: Double diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift index 123558b5b84..95d17b53d07 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift @@ -7,7 +7,7 @@ import Foundation -internal struct TypeHolderExample: Sendable, Codable, JSONEncodable { +internal struct TypeHolderExample: Sendable, Codable, QueryStringEncodable { internal private(set) var stringItem: String internal private(set) var numberItem: Double diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift index 96f93dd39eb..b5f6d6680fb 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift @@ -7,7 +7,7 @@ import Foundation -internal struct User: Sendable, Codable, JSONEncodable { +internal struct User: Sendable, Codable, QueryStringEncodable { internal private(set) var id: Int64? internal private(set) var username: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index 10a22eb807c..1dc51857a63 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -50,7 +50,7 @@ open class AnotherFakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index 4765274bd2a..214c215e113 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -48,7 +48,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -97,7 +97,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -146,7 +146,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -195,7 +195,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -244,7 +244,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -294,10 +294,10 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "query": (wrappedValue: query.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "query": (wrappedValue: query.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -348,7 +348,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -424,21 +424,21 @@ open class FakeAPI { open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "integer": integer?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int32": int32?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int64": int64?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "number": number.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "float": float?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "double": double.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "string": string?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "pattern_without_delimiter": patternWithoutDelimiter.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "byte": byte.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "binary": binary?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "date": date?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "dateTime": dateTime?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "password": password?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "callback": callback?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "integer": integer?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int32": int32?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int64": int64?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "number": number.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "float": float?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "double": double.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "string": string?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "pattern_without_delimiter": patternWithoutDelimiter.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "byte": byte.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "binary": binary?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "date": date?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "dateTime": dateTime?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "password": password?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "callback": callback?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -446,7 +446,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -574,9 +574,9 @@ open class FakeAPI { open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "enum_form_string_array": enumFormStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_form_string": enumFormString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "enum_form_string_array": enumFormStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_form_string": enumFormString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -584,16 +584,16 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_string": (wrappedValue: enumQueryString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string": (wrappedValue: enumQueryString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", - "enum_header_string_array": enumHeaderStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_header_string": enumHeaderString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "enum_header_string_array": enumHeaderStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_header_string": enumHeaderString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -649,19 +649,19 @@ open class FakeAPI { open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "required_string_group": (wrappedValue: requiredStringGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "required_int64_group": (wrappedValue: requiredInt64Group.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "string_group": (wrappedValue: stringGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "int64_group": (wrappedValue: int64Group?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_string_group": (wrappedValue: requiredStringGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_int64_group": (wrappedValue: requiredInt64Group.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "string_group": (wrappedValue: stringGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "int64_group": (wrappedValue: int64Group?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ - "required_boolean_group": requiredBooleanGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "boolean_group": booleanGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "required_boolean_group": requiredBooleanGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "boolean_group": booleanGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -710,7 +710,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -758,9 +758,9 @@ open class FakeAPI { open class func testJsonFormDataWithRequestBuilder(param: String, param2: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "param": param.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "param2": param2.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "param": param.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "param2": param2.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -768,7 +768,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index 4ddb2888e17..0a5295a1924 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -53,7 +53,7 @@ open class FakeClassnameTags123API { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index 7b00cef5f45..f020cbb840a 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -55,7 +55,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -109,12 +109,12 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ - "api_key": apiKey?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "api_key": apiKey?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -172,14 +172,14 @@ open class PetAPI { open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "status": (wrappedValue: status.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "status": (wrappedValue: status.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -231,14 +231,14 @@ open class PetAPI { open class func findPetsByTagsWithRequestBuilder(tags: [String], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "tags": (wrappedValue: tags.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "tags": (wrappedValue: tags.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -291,11 +291,11 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -348,7 +348,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -404,9 +404,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "name": name?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "status": status?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "name": name?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "status": status?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -414,7 +414,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -470,9 +470,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "file": file?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "file": file?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -480,7 +480,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] @@ -536,9 +536,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "requiredFile": requiredFile.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "requiredFile": requiredFile.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -546,7 +546,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index eb522d64ecc..970698c604e 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -49,11 +49,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -101,11 +101,11 @@ open class StoreAPI { open class func getInventoryWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -155,11 +155,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -209,7 +209,7 @@ open class StoreAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index 8b9ef268206..cd06a791142 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -50,7 +50,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -100,7 +100,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -150,7 +150,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -200,11 +200,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -253,11 +253,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -306,15 +306,15 @@ open class UserAPI { open class func loginUserWithRequestBuilder(username: String, password: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/login" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "username": (wrappedValue: username.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "password": (wrappedValue: password.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "username": (wrappedValue: username.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "password": (wrappedValue: password.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -358,11 +358,11 @@ open class UserAPI { open class func logoutUserWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/logout" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -418,7 +418,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 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 @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift index 6d50744862b..fadb83874b9 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift @@ -50,7 +50,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -60,7 +60,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters 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 3bf1690460b..4fe5bbe7e19 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,73 +9,49 @@ import Foundation import FoundationNetworking #endif -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -83,23 +59,23 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index f8e21e4d184..78a06110af5 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -9,8 +9,8 @@ import Foundation import FoundationNetworking #endif -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift index a583e24501b..802e927474b 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ public enum HTTPMethod: String { } public protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift index ca940fd8662..9bd081f7d00 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var mapString: [String: String]? public var mapMapString: [String: [String: String]]? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift index c8a6f210c55..b20104e0503 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift @@ -7,7 +7,7 @@ import Foundation -public struct Animal: Sendable, Codable, JSONEncodable, Hashable { +public struct Animal: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift index a8d7a4a1423..cea25ea52e2 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift @@ -7,7 +7,7 @@ import Foundation -public struct ApiResponse: Sendable, Codable, JSONEncodable, Hashable { +public struct ApiResponse: Sendable, Codable, QueryStringEncodable, Hashable { public var code: Int? public var type: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift index e569ab1877e..679279d61cb 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayArrayNumber: [[Double]]? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift index 2dd67b1cb58..d71bd4e40b7 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayNumber: [Double]? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift index 21943123d9e..839795229bb 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct ArrayTest: Sendable, Codable, JSONEncodable, Hashable { +public struct ArrayTest: Sendable, Codable, QueryStringEncodable, Hashable { public var arrayOfString: [String]? public var arrayArrayOfInteger: [[Int64]]? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift index 55de9b34a29..56100523e84 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift @@ -7,7 +7,7 @@ import Foundation -public struct Capitalization: Sendable, Codable, JSONEncodable, Hashable { +public struct Capitalization: Sendable, Codable, QueryStringEncodable, Hashable { public var smallCamel: String? public var capitalCamel: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift index 80ff359c186..cceeddd1bf9 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift @@ -7,7 +7,7 @@ import Foundation -public struct Cat: Sendable, Codable, JSONEncodable, Hashable { +public struct Cat: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift index d1cceeccfe8..c04a9e673cf 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift @@ -7,7 +7,7 @@ import Foundation -public struct Category: Sendable, Codable, JSONEncodable, Hashable { +public struct Category: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? = "default-name" diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift index 02002f7632a..53147d21e44 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model with \"_class\" property */ -public struct ClassModel: Sendable, Codable, JSONEncodable, Hashable { +public struct ClassModel: Sendable, Codable, QueryStringEncodable, Hashable { public var `class`: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift index e6792283509..b49ded4cc5c 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift @@ -7,7 +7,7 @@ import Foundation -public struct Client: Sendable, Codable, JSONEncodable, Hashable { +public struct Client: Sendable, Codable, QueryStringEncodable, Hashable { public var client: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift index 9cb18da8a57..99231ca03f7 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift @@ -7,7 +7,7 @@ import Foundation -public struct Dog: Sendable, Codable, JSONEncodable, Hashable { +public struct Dog: Sendable, Codable, QueryStringEncodable, Hashable { public var className: String public var color: String? = "red" diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift index a8f557dfc8e..09bbcb9f280 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumArrays: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumArrays: Sendable, Codable, QueryStringEncodable, Hashable { public enum JustSymbol: String, Sendable, Codable, CaseIterable { case greaterThanOrEqualTo = ">=" diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 298f93c69bd..d280112e88b 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct EnumTest: Sendable, Codable, JSONEncodable, Hashable { +public struct EnumTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum EnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift index 989bc5d0837..c35e1b2d53a 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift @@ -8,7 +8,7 @@ import Foundation /** Must be named `File` for test. */ -public struct File: Sendable, Codable, JSONEncodable, Hashable { +public struct File: Sendable, Codable, QueryStringEncodable, Hashable { /** Test capitalization */ public var sourceURI: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift index 4e7e54f8ca2..6ca430a91ba 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct FileSchemaTestClass: Sendable, Codable, JSONEncodable, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, QueryStringEncodable, Hashable { public var file: File? public var files: [File]? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift index 3bfc12535c3..427b85e7fd9 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct FormatTest: Sendable, Codable, JSONEncodable, Hashable { +public struct FormatTest: Sendable, Codable, QueryStringEncodable, Hashable { public static let integerRule = NumericRule(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil) public static let int32Rule = NumericRule(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil) diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift index 15c2cd2feee..e5db6255169 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct HasOnlyReadOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var foo: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift index a35819ac5ee..75c553df8fc 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift @@ -7,7 +7,7 @@ import Foundation -public struct List: Sendable, Codable, JSONEncodable, Hashable { +public struct List: Sendable, Codable, QueryStringEncodable, Hashable { public var _123list: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift index be8a35e8fcc..8cc06717f31 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift @@ -7,7 +7,7 @@ import Foundation -public struct MapTest: Sendable, Codable, JSONEncodable, Hashable { +public struct MapTest: Sendable, Codable, QueryStringEncodable, Hashable { public enum MapOfEnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift index 58d90fe83c5..2c7bd6d9c7c 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift @@ -7,7 +7,7 @@ import Foundation -public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, QueryStringEncodable, Hashable { public var uuid: UUID? public var dateTime: Date? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift index 5402b521875..8c5d8c7381c 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name starting with number */ -public struct Model200Response: Sendable, Codable, JSONEncodable, Hashable { +public struct Model200Response: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int? public var `class`: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift index b72dd32ecba..d0a98e0980b 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing model name same as property name */ -public struct Name: Sendable, Codable, JSONEncodable, Hashable { +public struct Name: Sendable, Codable, QueryStringEncodable, Hashable { public var name: Int public var snakeCase: NullEncodable = .encodeValue(11033) diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift index f2a25b6f0d2..47d2e318bb5 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift @@ -7,7 +7,7 @@ import Foundation -public struct NumberOnly: Sendable, Codable, JSONEncodable, Hashable { +public struct NumberOnly: Sendable, Codable, QueryStringEncodable, Hashable { public var justNumber: Double? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift index 9bc6ecf183e..6a9ecc5540c 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift @@ -7,7 +7,7 @@ import Foundation -public struct Order: Sendable, Codable, JSONEncodable, Hashable { +public struct Order: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case placed = "placed" diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift index 9d8a17c8fd2..0a4d002a2dd 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift @@ -7,7 +7,7 @@ import Foundation -public struct OuterComposite: Sendable, Codable, JSONEncodable, Hashable { +public struct OuterComposite: Sendable, Codable, QueryStringEncodable, Hashable { public var myNumber: Double? public var myString: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift index b1ccb862d1a..302a3052c6e 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift @@ -7,7 +7,7 @@ import Foundation -public struct Pet: Sendable, Codable, JSONEncodable, Hashable { +public struct Pet: Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case available = "available" diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift index 5c98c4b1fef..5a06da436f6 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift @@ -7,7 +7,7 @@ import Foundation -public struct ReadOnlyFirst: Sendable, Codable, JSONEncodable, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, QueryStringEncodable, Hashable { public var bar: String? public var baz: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift index ff8edb43e44..119f1dd597f 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift @@ -8,7 +8,7 @@ import Foundation /** Model for testing reserved words */ -public struct Return: Sendable, Codable, JSONEncodable, Hashable { +public struct Return: Sendable, Codable, QueryStringEncodable, Hashable { public var `return`: Int? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift index d566fc2b6eb..40ad8ff0a05 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift @@ -7,7 +7,7 @@ import Foundation -public struct SpecialModelName: Sendable, Codable, JSONEncodable, Hashable { +public struct SpecialModelName: Sendable, Codable, QueryStringEncodable, Hashable { public var specialPropertyName: Int64? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift index 8e4bd532137..8758ee8b93d 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift @@ -7,7 +7,7 @@ import Foundation -public struct StringBooleanMap: Sendable, Codable, JSONEncodable, Hashable { +public struct StringBooleanMap: Sendable, Codable, QueryStringEncodable, Hashable { public enum CodingKeys: CodingKey, CaseIterable { diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift index 514e6abfcee..7c19767a11f 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift @@ -7,7 +7,7 @@ import Foundation -public struct Tag: Sendable, Codable, JSONEncodable, Hashable { +public struct Tag: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var name: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift index a3fa21d8cb5..eaaab729500 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderDefault: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderDefault: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String = "what" public var numberItem: Double diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift index 6102e9a3726..bac80c4fcd2 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift @@ -7,7 +7,7 @@ import Foundation -public struct TypeHolderExample: Sendable, Codable, JSONEncodable, Hashable { +public struct TypeHolderExample: Sendable, Codable, QueryStringEncodable, Hashable { public var stringItem: String public var numberItem: Double diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift index ecdde64a8d1..e41975d4d66 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift @@ -7,7 +7,7 @@ import Foundation -public struct User: Sendable, Codable, JSONEncodable, Hashable { +public struct User: Sendable, Codable, QueryStringEncodable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift b/samples/client/petstore/swift6/rxswiftLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift index e2be777235e..f43452c2d49 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift @@ -23,28 +23,28 @@ class APIHelperTests: XCTestCase { } func testRejectNil() { - let source: [String: Any?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] - let expected: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] - let actual: [String: Any] = APIHelper.rejectNil(source)! + let source: [String: (any Sendable)?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] + let expected: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let actual: [String: any Sendable] = APIHelper.rejectNil(source)! XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testRejectNilHeaders() { - let source: [String: Any?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] + let source: [String: (any Sendable)?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false] let expected: [String: String] = ["a": "1", "c": "1,2", "d": "true", "e": "false"] let actual: [String: String] = APIHelper.rejectNilHeaders(source) XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testConvertBoolToString() { - let source: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] - let expected: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": "true", "e": "false"] - let actual: [String: Any] = APIHelper.convertBoolToString(source)! + let source: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let expected: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": "true", "e": "false"] + let actual: [String: any Sendable] = APIHelper.convertBoolToString(source)! XCTAssert(NSDictionary(dictionary: actual).isEqual(to: expected)) } func testMapValuesToQueryItems() { - let source: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] + let source: [String: any Sendable] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false] let expected: [URLQueryItem] = [URLQueryItem(name: "a", value: "1"), URLQueryItem(name: "c", value: "1"), URLQueryItem(name: "c", value: "2"), diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift index 4b57ceff573..c98034cadec 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift @@ -46,7 +46,7 @@ open class AnotherFakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift index f71732627a5..0bbc0a13f9a 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift @@ -44,7 +44,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -87,7 +87,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -130,7 +130,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -173,7 +173,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -216,7 +216,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -260,10 +260,10 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "query": (wrappedValue: query.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "query": (wrappedValue: query.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -308,7 +308,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -378,21 +378,21 @@ open class FakeAPI { open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "integer": integer?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int32": int32?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "int64": int64?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "number": number.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "float": float?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "double": double.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "string": string?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "pattern_without_delimiter": patternWithoutDelimiter.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "byte": byte.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "binary": binary?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "date": date?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "dateTime": dateTime?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "password": password?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "callback": callback?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "integer": integer?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int32": int32?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "int64": int64?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "number": number.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "float": float?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "double": double.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "string": string?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "pattern_without_delimiter": patternWithoutDelimiter.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "byte": byte.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "binary": binary?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "date": date?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "dateTime": dateTime?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "password": password?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "callback": callback?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -400,7 +400,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -522,9 +522,9 @@ open class FakeAPI { open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "enum_form_string_array": enumFormStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_form_string": enumFormString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "enum_form_string_array": enumFormStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_form_string": enumFormString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -532,16 +532,16 @@ open class FakeAPI { var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_string": (wrappedValue: enumQueryString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string_array": (wrappedValue: enumQueryStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_string": (wrappedValue: enumQueryString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_integer": (wrappedValue: enumQueryInteger?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "enum_query_double": (wrappedValue: enumQueryDouble?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", - "enum_header_string_array": enumHeaderStringArray?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "enum_header_string": enumHeaderString?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + "enum_header_string_array": enumHeaderStringArray?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "enum_header_string": enumHeaderString?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -591,19 +591,19 @@ open class FakeAPI { open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "required_string_group": (wrappedValue: requiredStringGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "required_int64_group": (wrappedValue: requiredInt64Group.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "string_group": (wrappedValue: stringGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "int64_group": (wrappedValue: int64Group?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_string_group": (wrappedValue: requiredStringGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "required_int64_group": (wrappedValue: requiredInt64Group.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "string_group": (wrappedValue: stringGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "int64_group": (wrappedValue: int64Group?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ - "required_boolean_group": requiredBooleanGroup.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "boolean_group": booleanGroup?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "required_boolean_group": requiredBooleanGroup.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "boolean_group": booleanGroup?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -646,7 +646,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -688,9 +688,9 @@ open class FakeAPI { open class func testJsonFormDataWithRequestBuilder(param: String, param2: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "param": param.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "param2": param2.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "param": param.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "param2": param2.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -698,7 +698,7 @@ open class FakeAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift index f4d4fe89c8c..154a17e59dc 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift @@ -49,7 +49,7 @@ open class FakeClassnameTags123API { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift index e4cf4b619d0..563bd708bf5 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift @@ -51,7 +51,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -99,12 +99,12 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ - "api_key": apiKey?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableNillableHeaders: [String: (any Sendable)?] = [ + "api_key": apiKey?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) @@ -156,14 +156,14 @@ open class PetAPI { open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "status": (wrappedValue: status.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "status": (wrappedValue: status.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -209,14 +209,14 @@ open class PetAPI { open class func findPetsByTagsWithRequestBuilder(tags: [String], apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "tags": (wrappedValue: tags.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "tags": (wrappedValue: tags.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -263,11 +263,11 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -314,7 +314,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/json", ] @@ -364,9 +364,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "name": name?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "status": status?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "name": name?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "status": status?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -374,7 +374,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "application/x-www-form-urlencoded", ] @@ -424,9 +424,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "file": file?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "file": file?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -434,7 +434,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] @@ -484,9 +484,9 @@ open class PetAPI { let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableFormParams: [String: Any?] = [ - "additionalMetadata": additionalMetadata?.encodeToJSON(codableHelper: apiConfiguration.codableHelper), - "requiredFile": requiredFile.encodeToJSON(codableHelper: apiConfiguration.codableHelper), + let localVariableFormParams: [String: (any Sendable)?] = [ + "additionalMetadata": additionalMetadata?.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), + "requiredFile": requiredFile.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), ] let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams) @@ -494,7 +494,7 @@ open class PetAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ "Content-Type": "multipart/form-data", ] diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift index ace217dd9d4..5e1cfc01ff6 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift @@ -45,11 +45,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -91,11 +91,11 @@ open class StoreAPI { open class func getInventoryWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -139,11 +139,11 @@ open class StoreAPI { let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -187,7 +187,7 @@ open class StoreAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/UserAPI.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/UserAPI.swift index 5e214fa9db1..9cabb7e1ccc 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/UserAPI.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs/UserAPI.swift @@ -46,7 +46,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -90,7 +90,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -134,7 +134,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -178,11 +178,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -225,11 +225,11 @@ open class UserAPI { let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -272,15 +272,15 @@ open class UserAPI { open class func loginUserWithRequestBuilder(username: String, password: String, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/login" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) localVariableUrlComponents?.queryItems = APIHelper.mapValuesToQueryItems([ - "username": (wrappedValue: username.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), - "password": (wrappedValue: password.encodeToJSON(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "username": (wrappedValue: username.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), + "password": (wrappedValue: password.encodeToQueryString(codableHelper: apiConfiguration.codableHelper), isExplode: false), ]) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -318,11 +318,11 @@ open class UserAPI { open class func logoutUserWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/user/logout" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] @@ -372,7 +372,7 @@ open class UserAPI { let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift index 62aafe3f0d5..24a6741108e 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift @@ -52,7 +52,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -62,7 +62,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters 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 b4341b60870..7dd50aa2e70 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -9,73 +9,49 @@ import Foundation import FoundationNetworking #endif -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -83,24 +59,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Models.swift index f8e21e4d184..78a06110af5 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Models.swift @@ -9,8 +9,8 @@ import Foundation import FoundationNetworking #endif -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift index a583e24501b..802e927474b 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ public enum HTTPMethod: String { } public protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift index 647008ec468..ea478acb7d2 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift @@ -12,7 +12,7 @@ public typealias AdditionalPropertiesClass = PetstoreClientAPI.AdditionalPropert extension PetstoreClientAPI { -public final class AdditionalPropertiesClass: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class AdditionalPropertiesClass: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var mapString: [String: String]? public private(set) var mapMapString: [String: [String: String]]? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Animal.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Animal.swift index 800f4b485b7..357a845d209 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Animal.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Animal.swift @@ -12,7 +12,7 @@ public typealias Animal = PetstoreClientAPI.Animal extension PetstoreClientAPI { -public final class Animal: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Animal: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var className: String public private(set) var color: String? = "red" diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ApiResponse.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ApiResponse.swift index 53b98ed3943..4462e1f2a78 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ApiResponse.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ApiResponse.swift @@ -12,7 +12,7 @@ public typealias ApiResponse = PetstoreClientAPI.ApiResponse extension PetstoreClientAPI { -public final class ApiResponse: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class ApiResponse: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var code: Int? public private(set) var type: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift index 82565fb113c..60b1d85948b 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift @@ -12,7 +12,7 @@ public typealias ArrayOfArrayOfNumberOnly = PetstoreClientAPI.ArrayOfArrayOfNumb extension PetstoreClientAPI { -public final class ArrayOfArrayOfNumberOnly: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class ArrayOfArrayOfNumberOnly: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var arrayArrayNumber: [[Double]]? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift index 9a148295ee5..1274fde376f 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift @@ -12,7 +12,7 @@ public typealias ArrayOfNumberOnly = PetstoreClientAPI.ArrayOfNumberOnly extension PetstoreClientAPI { -public final class ArrayOfNumberOnly: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class ArrayOfNumberOnly: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var arrayNumber: [Double]? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayTest.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayTest.swift index 54d6681a21f..ff04ef4605c 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayTest.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ArrayTest.swift @@ -12,7 +12,7 @@ public typealias ArrayTest = PetstoreClientAPI.ArrayTest extension PetstoreClientAPI { -public final class ArrayTest: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class ArrayTest: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var arrayOfString: [String]? public private(set) var arrayArrayOfInteger: [[Int64]]? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Capitalization.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Capitalization.swift index f096c749b56..5dcd4d60b00 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Capitalization.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Capitalization.swift @@ -12,7 +12,7 @@ public typealias Capitalization = PetstoreClientAPI.Capitalization extension PetstoreClientAPI { -public final class Capitalization: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Capitalization: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var smallCamel: String? public private(set) var capitalCamel: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Cat.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Cat.swift index 4321d729655..d45ec288b61 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Cat.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Cat.swift @@ -12,7 +12,7 @@ public typealias Cat = PetstoreClientAPI.Cat extension PetstoreClientAPI { -public final class Cat: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Cat: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var className: String public private(set) var color: String? = "red" diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Category.swift index 5563e7499e9..e8e40daf46d 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Category.swift @@ -12,7 +12,7 @@ public typealias Category = PetstoreClientAPI.Category extension PetstoreClientAPI { -public final class Category: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Category: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var id: Int64? public private(set) var name: String? = "default-name" diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ClassModel.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ClassModel.swift index 34586eeae1d..82ae62fe2c1 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ClassModel.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ClassModel.swift @@ -13,7 +13,7 @@ public typealias ClassModel = PetstoreClientAPI.ClassModel extension PetstoreClientAPI { /** Model for testing model with \"_class\" property */ -public final class ClassModel: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class ClassModel: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var _class: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Client.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Client.swift index 52eef660ce0..4fa4270370a 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Client.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Client.swift @@ -12,7 +12,7 @@ public typealias Client = PetstoreClientAPI.Client extension PetstoreClientAPI { -public final class Client: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Client: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var client: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Dog.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Dog.swift index 43977c5ca43..ae9f7646664 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Dog.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Dog.swift @@ -12,7 +12,7 @@ public typealias Dog = PetstoreClientAPI.Dog extension PetstoreClientAPI { -public final class Dog: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Dog: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var className: String public private(set) var color: String? = "red" diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumArrays.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumArrays.swift index d2c4fcfbda2..ed9fe33b381 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumArrays.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumArrays.swift @@ -12,7 +12,7 @@ public typealias EnumArrays = PetstoreClientAPI.EnumArrays extension PetstoreClientAPI { -public final class EnumArrays: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class EnumArrays: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public enum JustSymbol: String, Sendable, Codable, CaseIterable { case greaterThanOrEqualTo = ">=" diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift index cb9602c96db..9eed072f206 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift @@ -12,7 +12,7 @@ public typealias EnumTest = PetstoreClientAPI.EnumTest extension PetstoreClientAPI { -public final class EnumTest: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class EnumTest: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public enum EnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/File.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/File.swift index f6bf884680e..b2988872347 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/File.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/File.swift @@ -13,7 +13,7 @@ public typealias File = PetstoreClientAPI.File extension PetstoreClientAPI { /** Must be named `File` for test. */ -public final class File: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class File: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { /** Test capitalization */ public private(set) var sourceURI: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift index 6bb98feb9ac..92f30d1c7e7 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift @@ -12,7 +12,7 @@ public typealias FileSchemaTestClass = PetstoreClientAPI.FileSchemaTestClass extension PetstoreClientAPI { -public final class FileSchemaTestClass: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class FileSchemaTestClass: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var file: File? public private(set) var files: [File]? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/FormatTest.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/FormatTest.swift index e45cfbe07d9..8e7646673a6 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/FormatTest.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/FormatTest.swift @@ -12,7 +12,7 @@ public typealias FormatTest = PetstoreClientAPI.FormatTest extension PetstoreClientAPI { -public final class FormatTest: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class FormatTest: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public static let integerRule = NumericRule(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil) public static let int32Rule = NumericRule(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil) diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift index 41dd0e80f5a..1837d18b4b8 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift @@ -12,7 +12,7 @@ public typealias HasOnlyReadOnly = PetstoreClientAPI.HasOnlyReadOnly extension PetstoreClientAPI { -public final class HasOnlyReadOnly: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class HasOnlyReadOnly: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var bar: String? public private(set) var foo: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/List.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/List.swift index 5425c2983be..a3c39e02da3 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/List.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/List.swift @@ -12,7 +12,7 @@ public typealias List = PetstoreClientAPI.List extension PetstoreClientAPI { -public final class List: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class List: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var _123list: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/MapTest.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/MapTest.swift index 4f2f04eebca..7f96dfa358e 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/MapTest.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/MapTest.swift @@ -12,7 +12,7 @@ public typealias MapTest = PetstoreClientAPI.MapTest extension PetstoreClientAPI { -public final class MapTest: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class MapTest: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public enum MapOfEnumString: String, Sendable, Codable, CaseIterable { case upper = "UPPER" diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift index e9d7f3915f5..cc8d77a3afa 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift @@ -12,7 +12,7 @@ public typealias MixedPropertiesAndAdditionalPropertiesClass = PetstoreClientAPI extension PetstoreClientAPI { -public final class MixedPropertiesAndAdditionalPropertiesClass: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class MixedPropertiesAndAdditionalPropertiesClass: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var uuid: UUID? public private(set) var dateTime: Date? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Model200Response.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Model200Response.swift index c130ec4d211..bd6a2b39c63 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Model200Response.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Model200Response.swift @@ -13,7 +13,7 @@ public typealias Model200Response = PetstoreClientAPI.Model200Response extension PetstoreClientAPI { /** Model for testing model name starting with number */ -public final class Model200Response: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Model200Response: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var name: Int? public private(set) var _class: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Name.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Name.swift index 58b488e7716..b8a7a669253 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Name.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Name.swift @@ -13,7 +13,7 @@ public typealias Name = PetstoreClientAPI.Name extension PetstoreClientAPI { /** Model for testing model name same as property name */ -public final class Name: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Name: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var name: Int public private(set) var snakeCase: NullEncodable = .encodeValue(11033) diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/NumberOnly.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/NumberOnly.swift index 1a04b3e4b00..fa23845da2d 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/NumberOnly.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/NumberOnly.swift @@ -12,7 +12,7 @@ public typealias NumberOnly = PetstoreClientAPI.NumberOnly extension PetstoreClientAPI { -public final class NumberOnly: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class NumberOnly: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var justNumber: Double? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Order.swift index c26bec17f7e..e9bbd2fb12b 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Order.swift @@ -12,7 +12,7 @@ public typealias Order = PetstoreClientAPI.Order extension PetstoreClientAPI { -public final class Order: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Order: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case placed = "placed" diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/OuterComposite.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/OuterComposite.swift index 3a52a7edad1..eec104a999d 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/OuterComposite.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/OuterComposite.swift @@ -12,7 +12,7 @@ public typealias OuterComposite = PetstoreClientAPI.OuterComposite extension PetstoreClientAPI { -public final class OuterComposite: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class OuterComposite: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var myNumber: Double? public private(set) var myString: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Pet.swift index 310d37f8bf6..6a9383bde10 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Pet.swift @@ -12,7 +12,7 @@ public typealias Pet = PetstoreClientAPI.Pet extension PetstoreClientAPI { -public final class Pet: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Pet: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public enum Status: String, Sendable, Codable, CaseIterable { case available = "available" diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift index 69e4703d1b8..647ebd82e19 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift @@ -12,7 +12,7 @@ public typealias ReadOnlyFirst = PetstoreClientAPI.ReadOnlyFirst extension PetstoreClientAPI { -public final class ReadOnlyFirst: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class ReadOnlyFirst: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var bar: String? public private(set) var baz: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Return.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Return.swift index 8b3160efd86..bf05589cea2 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Return.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Return.swift @@ -13,7 +13,7 @@ public typealias Return = PetstoreClientAPI.Return extension PetstoreClientAPI { /** Model for testing reserved words */ -public final class Return: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Return: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var _return: Int? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift index fa3abd61bf6..aaedf5eb82c 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift @@ -12,7 +12,7 @@ public typealias SpecialModelName = PetstoreClientAPI.SpecialModelName extension PetstoreClientAPI { -public final class SpecialModelName: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class SpecialModelName: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var specialPropertyName: Int64? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift index b8ae10de366..18bda640e08 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift @@ -12,7 +12,7 @@ public typealias StringBooleanMap = PetstoreClientAPI.StringBooleanMap extension PetstoreClientAPI { -public final class StringBooleanMap: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class StringBooleanMap: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public enum CodingKeys: CodingKey, CaseIterable { diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Tag.swift index f3b364ebefe..fe977d0e10f 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Tag.swift @@ -12,7 +12,7 @@ public typealias Tag = PetstoreClientAPI.Tag extension PetstoreClientAPI { -public final class Tag: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class Tag: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var id: Int64? public private(set) var name: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift index 14a1ca4ed18..f8abdfee088 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift @@ -12,7 +12,7 @@ public typealias TypeHolderDefault = PetstoreClientAPI.TypeHolderDefault extension PetstoreClientAPI { -public final class TypeHolderDefault: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class TypeHolderDefault: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var stringItem: String = "what" public private(set) var numberItem: Double diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift index f07991632f5..9020b77e43c 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift @@ -12,7 +12,7 @@ public typealias TypeHolderExample = PetstoreClientAPI.TypeHolderExample extension PetstoreClientAPI { -public final class TypeHolderExample: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class TypeHolderExample: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var stringItem: String public private(set) var numberItem: Double diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/User.swift index 1b1796878db..7a29f785a4c 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/User.swift @@ -12,7 +12,7 @@ public typealias User = PetstoreClientAPI.User extension PetstoreClientAPI { -public final class User: @unchecked Sendable, Codable, JSONEncodable, Hashable { +public final class User: @unchecked Sendable, Codable, QueryStringEncodable, Hashable { public private(set) var id: Int64? public private(set) var username: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift b/samples/client/petstore/swift6/urlsessionLibrary/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift index 8d162878dd9..e62c0d14fe1 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift @@ -27,7 +27,7 @@ class DateFormatTests: XCTestCase { super.tearDown() } - func testEncodeToJSONAlwaysResultsInUTCEncodedDate() { + func testencodeToQueryStringAlwaysResultsInUTCEncodedDate() { var dateComponents = DateComponents() dateComponents.calendar = Calendar(identifier: .gregorian) dateComponents.year = 2018 @@ -47,7 +47,7 @@ class DateFormatTests: XCTestCase { return } - var encodedDate = utcDate.encodeToJSON(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String + var encodedDate = utcDate.encodeToQueryString(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String XCTAssert(encodedDate.hasSuffix("Z")) // test with a positive timzone offset from UTC @@ -59,7 +59,7 @@ class DateFormatTests: XCTestCase { return } - encodedDate = nonUTCDate1.encodeToJSON(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String + encodedDate = nonUTCDate1.encodeToQueryString(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String XCTAssert(encodedDate.hasSuffix("Z")) // test with a negative timzone offset from UTC @@ -71,7 +71,7 @@ class DateFormatTests: XCTestCase { return } - encodedDate = nonUTCDate2.encodeToJSON(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String + encodedDate = nonUTCDate2.encodeToQueryString(codableHelper: PetstoreClientAPIConfiguration.shared.codableHelper) as! String XCTAssert(encodedDate.hasSuffix("Z")) } diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift index 18ada88cecb..3ac2200c3a6 100644 --- a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift +++ b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift @@ -27,11 +27,11 @@ open class DefaultAPI { open class func rootGetWithRequestBuilder(apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) -> RequestBuilder { let localVariablePath = "/" let localVariableURLString = apiConfiguration.basePath + localVariablePath - let localVariableParameters: [String: Any]? = nil + let localVariableParameters: [String: any Sendable]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) - let localVariableNillableHeaders: [String: Any?] = [ + let localVariableNillableHeaders: [String: (any Sendable)?] = [ : ] 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 7c975bb6c9b..043b37a03bf 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 @@ -7,8 +7,8 @@ import Foundation public struct APIHelper { - public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { result, item in + public static func rejectNil(_ source: [String: (any Sendable)?]) -> [String: any Sendable]? { + let destination = source.reduce(into: [String: any Sendable]()) { result, item in if let value = item.value { result[item.key] = value } @@ -20,7 +20,7 @@ public struct APIHelper { return destination } - public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + public static func rejectNilHeaders(_ source: [String: (any Sendable)?]) -> [String: String] { return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection @@ -32,12 +32,12 @@ public struct APIHelper { } } - public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + public static func convertBoolToString(_ source: [String: any Sendable]?) -> [String: any Sendable]? { guard let source = source else { return nil } - return source.reduce(into: [String: Any]()) { result, item in + return source.reduce(into: [String: any Sendable]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description @@ -99,7 +99,7 @@ public struct APIHelper { /// maps all values from source to query parameters /// /// collection values are always exploded - public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + public static func mapValuesToQueryItems(_ source: [String: (any Sendable)?]) -> [URLQueryItem]? { let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { collection diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift index 30038c2863a..afbacc34359 100644 --- a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +++ b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift @@ -50,7 +50,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable { open class RequestBuilder: @unchecked Sendable { public var credential: URLCredential? public var headers: [String: String] - public let parameters: [String: Any]? + public let parameters: [String: any Sendable]? public let method: String public let URLString: String public let requestTask: RequestTask = RequestTask() @@ -60,7 +60,7 @@ open class RequestBuilder: @unchecked Sendable { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { self.method = method self.URLString = URLString self.parameters = parameters 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 b4341b60870..7dd50aa2e70 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,73 +9,49 @@ import Foundation import FoundationNetworking #endif -extension Bool: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +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 Float: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } +extension RawRepresentable where RawValue: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { String(describing: rawValue) } } -extension Int: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int32: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Int64: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Double: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension Decimal: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension String: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension URL: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension UUID: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { self } -} - -extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { return self.rawValue } -} - -private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> Any { - if let encodableObject = object as? JSONEncodable { - return encodableObject.encodeToJSON(codableHelper: codableHelper) +private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> String { + if let encodableObject = object as? QueryStringEncodable { + return encodableObject.encodeToQueryString(codableHelper: codableHelper) } else { - return object + return String(describing: object) } } -extension Array: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Array { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { return self.map { encodeIfPossible($0, codableHelper: codableHelper) } } } -extension Set: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - return Array(self).encodeToJSON(codableHelper: codableHelper) +extension Set { + func encodeToQueryString(codableHelper: CodableHelper) -> [String] { + return Array(self).encodeToQueryString(codableHelper: codableHelper) } } -extension Dictionary: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { - var dictionary = [AnyHashable: Any]() +extension Dictionary { + func encodeToQueryString(codableHelper: CodableHelper) -> [Key: String] { + var dictionary = [Key: String]() for (key, value) in self { dictionary[key] = encodeIfPossible(value, codableHelper: codableHelper) } @@ -83,24 +59,24 @@ extension Dictionary: JSONEncodable { } } -extension Data: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Data: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return self.base64EncodedString(options: Data.Base64EncodingOptions()) } } -extension Date: JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension Date: QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { return codableHelper.dateFormatter.string(from: self) } } -extension JSONEncodable where Self: Encodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any { +extension QueryStringEncodable where Self: Encodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String { guard let data = try? codableHelper.jsonEncoder.encode(self) else { fatalError("Could not encode to json: \(self)") } - return data.encodeToJSON(codableHelper: codableHelper) + return data.encodeToQueryString(codableHelper: codableHelper) } } diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift index cb3121a4f63..a8e95d4c7ce 100644 --- a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +++ b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift @@ -10,7 +10,7 @@ import Foundation import FoundationNetworking #endif -public struct JSONDataEncoding { +public struct JSONDataEncoding: Sendable { // MARK: Properties @@ -27,8 +27,8 @@ public struct JSONDataEncoding { /// - throws: An `Error` if the encoding process encounters an error. /// /// - returns: The encoded request. - public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { - var urlRequest = urlRequest + public func encode(request: URLRequest, with parameters: [String: any Sendable]?) -> URLRequest { + var urlRequest = request guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { return urlRequest @@ -43,10 +43,10 @@ public struct JSONDataEncoding { return urlRequest } - public static func encodingParameters(jsonData: Data?) -> [String: Any]? { - var returnedParams: [String: Any]? + public static func encodingParameters(jsonData: Data?) -> [String: any Sendable]? { + var returnedParams: [String: any Sendable]? if let jsonData = jsonData, !jsonData.isEmpty { - var params: [String: Any] = [:] + var params: [String: any Sendable] = [:] params[jsonDataKey] = jsonData returnedParams = params } diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift index c64469f5f3a..d28af2eba97 100644 --- a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +++ b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift @@ -9,8 +9,8 @@ import Foundation open class JSONEncodingHelper { - open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: T?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? // Encode the Encodable object if let encodableObj = encodableObj { @@ -26,8 +26,8 @@ open class JSONEncodingHelper { return params } - open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: Any]? { - var params: [String: Any]? + open class func encodingParameters(forEncodableObject encodableObj: Any?, codableHelper: CodableHelper) -> [String: any Sendable]? { + var params: [String: any Sendable]? if let encodableObj = encodableObj { do { diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index f8e21e4d184..78a06110af5 100644 --- a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -9,8 +9,8 @@ import Foundation import FoundationNetworking #endif -protocol JSONEncodable { - func encodeToJSON(codableHelper: CodableHelper) -> Any +protocol QueryStringEncodable { + func encodeToQueryString(codableHelper: CodableHelper) -> String } /// An enum where the last case value can be used as a default catch-all. diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift index a583e24501b..802e927474b 100644 --- a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +++ b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift @@ -71,7 +71,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable { open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { + required public init(method: String, URLString: String, parameters: [String: any Sendable]?, headers: [String: String] = [:], requiresAuthentication: Bool, apiConfiguration: PetstoreClientAPIConfiguration = PetstoreClientAPIConfiguration.shared) { super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, apiConfiguration: apiConfiguration) } @@ -112,7 +112,7 @@ open class URLSessionRequestBuilder: RequestBuilder, @unchecked Sendable { originalRequest.setValue(value, forHTTPHeaderField: key) } - let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + let modifiedRequest = try encoding.encode(request: originalRequest, with: parameters) return modifiedRequest } @@ -431,13 +431,13 @@ public enum HTTPMethod: String { } public protocol ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest } private class URLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters else { return urlRequest } @@ -462,9 +462,9 @@ private class FormDataEncoding: ParameterEncoding { self.contentTypeForFormPart = contentTypeForFormPart } - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let parameters = parameters, !parameters.isEmpty else { return urlRequest @@ -631,9 +631,9 @@ private class FormDataEncoding: ParameterEncoding { } private class FormURLEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request var requestBodyComponents = URLComponents() let queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) @@ -661,9 +661,9 @@ private class FormURLEncoding: ParameterEncoding { } private class OctetStreamEncoding: ParameterEncoding { - func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + func encode(request: URLRequest, with parameters: [String: any Sendable]?) throws -> URLRequest { - var urlRequest = urlRequest + var urlRequest = request guard let body = parameters?["body"] else { return urlRequest } diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Models/Banana.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Models/Banana.swift index 5013d8f8d06..81ddce1c41e 100644 --- a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Models/Banana.swift +++ b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Models/Banana.swift @@ -7,7 +7,7 @@ import Foundation -public struct Banana: Sendable, Codable, JSONEncodable, Hashable { +public struct Banana: Sendable, Codable, QueryStringEncodable, Hashable { public static let countRule = NumericRule(minimum: 10, exclusiveMinimum: true, maximum: 100, exclusiveMaximum: true, multipleOf: 5) public static let idsRule = ArrayRule(minItems: 1, maxItems: 10, uniqueItems: false)