diff --git a/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache b/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache index 0f661a170b32..b009950d7123 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Extensions.mustache @@ -51,8 +51,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -95,15 +97,6 @@ extension Date: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { return codableHelper.dateFormatter.string(from: self) } -} - -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } }{{/useVapor}}{{#generateModelAdditionalProperties}} extension String: @retroactive CodingKey { diff --git a/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache index 85e5a737230b..189c245ffc62 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{{#useParameterConvertible}}, ParameterConvertible{{/useParameterConvertible}}{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} { -{{/objcCompatible}}{{#objcCompatible}}@objcMembers {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable{{#useParameterConvertible}}, ParameterConvertible{{/useParameterConvertible}} { +{{^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{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} { +{{/objcCompatible}}{{#objcCompatible}}@objcMembers {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable { {{/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 06205f18249c..9c8d75da0096 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{{#useParameterConvertible}}, ParameterConvertible{{/useParameterConvertible}}{{#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{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{/useVapor}} { {{#oneOf}} case type{{#transformArrayType}}{{.}}{{/transformArrayType}}({{.}}) {{/oneOf}} diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift index fc0b544a05c3..68e48268d1b7 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -49,8 +49,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -95,15 +97,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 4bf7be0f2491..e15887fc3585 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, 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 e2e0e01546a9..846d0bffd42e 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, ParameterConvertible, Hashable { +public struct Animal: Sendable, Codable, 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 3e6a6f952ee1..5f8cfe3d5102 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, ParameterConvertible, Hashable { +public struct ApiResponse: Sendable, Codable, 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 5e7b7650f855..63dfb69bbabb 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, ParameterConvertible, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, 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 abe8c9ea8568..3ed50f5074e1 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, ParameterConvertible, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, 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 1f24ed5e7315..652ad17e7778 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, ParameterConvertible, Hashable { +public struct ArrayTest: Sendable, Codable, 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 090b3a75515d..a86eb5e7cc3f 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, ParameterConvertible, Hashable { +public struct Capitalization: Sendable, Codable, 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 36a552d208d5..f4b05d09080b 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, ParameterConvertible, Hashable { +public struct Cat: Sendable, Codable, 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 66785088d3dd..64f4cbd29125 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, ParameterConvertible, Hashable { +public struct Category: Sendable, Codable, 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 4e9a2272ef78..559a00895906 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, ParameterConvertible, Hashable { +public struct ClassModel: Sendable, Codable, 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 71fe46ac1bd8..171b4da0eca7 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, ParameterConvertible, Hashable { +public struct Client: Sendable, Codable, 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 134cc4ad51f5..d48f9e70e605 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, ParameterConvertible, Hashable { +public struct Dog: Sendable, Codable, 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 4f7b547df685..935594d56b5e 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, ParameterConvertible, Hashable { +public struct EnumArrays: Sendable, Codable, 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 9472c599e8be..a21aa87d0e5e 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, ParameterConvertible, Hashable { +public struct EnumTest: Sendable, Codable, 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 2b1d20efb35e..7360adbc0a29 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, ParameterConvertible, Hashable { +public struct File: Sendable, Codable, 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 528709b3c7e9..54afadae66b5 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, ParameterConvertible, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, 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 b1d4962c090a..3051d9ab9c53 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, ParameterConvertible, Hashable { +public struct FormatTest: Sendable, Codable, 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 850da288bf0d..5b5fe48fb7e5 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, ParameterConvertible, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, 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 415ef215291e..78e1feb2beff 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, ParameterConvertible, Hashable { +public struct List: Sendable, Codable, 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 b373fbe82924..6420157b29ae 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, ParameterConvertible, Hashable { +public struct MapTest: Sendable, Codable, 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 0f667b7668ae..06c6a2752677 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, ParameterConvertible, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, 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 0eadfe3042ae..aeab3b15a102 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, ParameterConvertible, Hashable { +public struct Model200Response: Sendable, Codable, 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 82bba99bf668..4f6830570025 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, ParameterConvertible, Hashable { +public struct Name: Sendable, Codable, 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 05bd45180b0c..3621d67757e9 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, ParameterConvertible, Hashable { +public struct NumberOnly: Sendable, Codable, 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 9f2556d6c0e3..bf2137d27a16 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, ParameterConvertible, Hashable { +public struct Order: Sendable, Codable, 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 34a4ed7b12e9..5893a2807418 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, ParameterConvertible, Hashable { +public struct OuterComposite: Sendable, Codable, 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 cd28268b345c..5e9084ec2ef2 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, ParameterConvertible, Hashable { +public struct Pet: Sendable, Codable, 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 5d6c8a6c9cf2..fd389ad1422d 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, ParameterConvertible, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, 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 c2a1b7f73c83..2fd94d66e2ab 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, ParameterConvertible, Hashable { +public struct Return: Sendable, Codable, 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 000b39a8a136..95c7afe37e25 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, ParameterConvertible, Hashable { +public struct SpecialModelName: Sendable, Codable, 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 0ec7c4862086..50ecf3d40383 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, ParameterConvertible, Hashable { +public struct StringBooleanMap: Sendable, Codable, 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 df5505fc4bcb..510c09ab0201 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, ParameterConvertible, Hashable { +public struct Tag: Sendable, Codable, 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 459e3c03da41..0824151955c3 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, ParameterConvertible, Hashable { +public struct TypeHolderDefault: Sendable, Codable, 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 628ca869217f..437e8d3a7a02 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, ParameterConvertible, Hashable { +public struct TypeHolderExample: Sendable, Codable, 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 33fa97c11eb4..f012dafe19c6 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, ParameterConvertible, Hashable { +public struct User: Sendable, Codable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift index 6b6bf2d2b5a7..2b6269d34a6b 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -50,8 +50,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -96,15 +98,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 4bf7be0f2491..e15887fc3585 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, 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 e2e0e01546a9..846d0bffd42e 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, ParameterConvertible, Hashable { +public struct Animal: Sendable, Codable, 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 3e6a6f952ee1..5f8cfe3d5102 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, ParameterConvertible, Hashable { +public struct ApiResponse: Sendable, Codable, 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 5e7b7650f855..63dfb69bbabb 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, ParameterConvertible, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, 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 abe8c9ea8568..3ed50f5074e1 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, ParameterConvertible, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, 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 1f24ed5e7315..652ad17e7778 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, ParameterConvertible, Hashable { +public struct ArrayTest: Sendable, Codable, 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 090b3a75515d..a86eb5e7cc3f 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, ParameterConvertible, Hashable { +public struct Capitalization: Sendable, Codable, 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 36a552d208d5..f4b05d09080b 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, ParameterConvertible, Hashable { +public struct Cat: Sendable, Codable, 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 66785088d3dd..64f4cbd29125 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, ParameterConvertible, Hashable { +public struct Category: Sendable, Codable, 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 4e9a2272ef78..559a00895906 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, ParameterConvertible, Hashable { +public struct ClassModel: Sendable, Codable, 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 71fe46ac1bd8..171b4da0eca7 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, ParameterConvertible, Hashable { +public struct Client: Sendable, Codable, 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 134cc4ad51f5..d48f9e70e605 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, ParameterConvertible, Hashable { +public struct Dog: Sendable, Codable, 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 4f7b547df685..935594d56b5e 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, ParameterConvertible, Hashable { +public struct EnumArrays: Sendable, Codable, 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 9472c599e8be..a21aa87d0e5e 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, ParameterConvertible, Hashable { +public struct EnumTest: Sendable, Codable, 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 2b1d20efb35e..7360adbc0a29 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, ParameterConvertible, Hashable { +public struct File: Sendable, Codable, 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 528709b3c7e9..54afadae66b5 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, ParameterConvertible, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, 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 6f3611ffba48..14a0f032d53e 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, ParameterConvertible, Hashable { +public struct FormatTest: Sendable, Codable, 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 850da288bf0d..5b5fe48fb7e5 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, ParameterConvertible, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, 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 415ef215291e..78e1feb2beff 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, ParameterConvertible, Hashable { +public struct List: Sendable, Codable, 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 f0f065b798de..414520cef41b 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, ParameterConvertible, Hashable { +public struct MapTest: Sendable, Codable, 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 0f667b7668ae..06c6a2752677 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, ParameterConvertible, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, 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 0eadfe3042ae..aeab3b15a102 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, ParameterConvertible, Hashable { +public struct Model200Response: Sendable, Codable, 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 82bba99bf668..4f6830570025 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, ParameterConvertible, Hashable { +public struct Name: Sendable, Codable, 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 05bd45180b0c..3621d67757e9 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, ParameterConvertible, Hashable { +public struct NumberOnly: Sendable, Codable, 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 9f2556d6c0e3..bf2137d27a16 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, ParameterConvertible, Hashable { +public struct Order: Sendable, Codable, 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 34a4ed7b12e9..5893a2807418 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, ParameterConvertible, Hashable { +public struct OuterComposite: Sendable, Codable, 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 cd28268b345c..5e9084ec2ef2 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, ParameterConvertible, Hashable { +public struct Pet: Sendable, Codable, 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 5d6c8a6c9cf2..fd389ad1422d 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, ParameterConvertible, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, 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 c2a1b7f73c83..2fd94d66e2ab 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, ParameterConvertible, Hashable { +public struct Return: Sendable, Codable, 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 000b39a8a136..95c7afe37e25 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, ParameterConvertible, Hashable { +public struct SpecialModelName: Sendable, Codable, 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 df5505fc4bcb..510c09ab0201 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, ParameterConvertible, Hashable { +public struct Tag: Sendable, Codable, 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 459e3c03da41..0824151955c3 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, ParameterConvertible, Hashable { +public struct TypeHolderDefault: Sendable, Codable, 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 628ca869217f..437e8d3a7a02 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, ParameterConvertible, Hashable { +public struct TypeHolderExample: Sendable, Codable, 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 33fa97c11eb4..f012dafe19c6 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, ParameterConvertible, Hashable { +public struct User: Sendable, Codable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift index fc0b544a05c3..68e48268d1b7 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -49,8 +49,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -95,15 +97,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 4bf7be0f2491..e15887fc3585 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, 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 e2e0e01546a9..846d0bffd42e 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, ParameterConvertible, Hashable { +public struct Animal: Sendable, Codable, 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 3e6a6f952ee1..5f8cfe3d5102 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, ParameterConvertible, Hashable { +public struct ApiResponse: Sendable, Codable, 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 5e7b7650f855..63dfb69bbabb 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, ParameterConvertible, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, 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 abe8c9ea8568..3ed50f5074e1 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, ParameterConvertible, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, 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 1f24ed5e7315..652ad17e7778 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, ParameterConvertible, Hashable { +public struct ArrayTest: Sendable, Codable, 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 090b3a75515d..a86eb5e7cc3f 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, ParameterConvertible, Hashable { +public struct Capitalization: Sendable, Codable, 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 36a552d208d5..f4b05d09080b 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, ParameterConvertible, Hashable { +public struct Cat: Sendable, Codable, 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 66785088d3dd..64f4cbd29125 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, ParameterConvertible, Hashable { +public struct Category: Sendable, Codable, 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 4e9a2272ef78..559a00895906 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, ParameterConvertible, Hashable { +public struct ClassModel: Sendable, Codable, 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 71fe46ac1bd8..171b4da0eca7 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, ParameterConvertible, Hashable { +public struct Client: Sendable, Codable, 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 134cc4ad51f5..d48f9e70e605 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, ParameterConvertible, Hashable { +public struct Dog: Sendable, Codable, 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 4f7b547df685..935594d56b5e 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, ParameterConvertible, Hashable { +public struct EnumArrays: Sendable, Codable, 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 9472c599e8be..a21aa87d0e5e 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, ParameterConvertible, Hashable { +public struct EnumTest: Sendable, Codable, 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 2b1d20efb35e..7360adbc0a29 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, ParameterConvertible, Hashable { +public struct File: Sendable, Codable, 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 528709b3c7e9..54afadae66b5 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, ParameterConvertible, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, 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 695d9a443588..fe06e48fa23a 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, ParameterConvertible, Hashable { +public struct FormatTest: Sendable, Codable, 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 850da288bf0d..5b5fe48fb7e5 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, ParameterConvertible, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, 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 415ef215291e..78e1feb2beff 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, ParameterConvertible, Hashable { +public struct List: Sendable, Codable, 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 b373fbe82924..6420157b29ae 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, ParameterConvertible, Hashable { +public struct MapTest: Sendable, Codable, 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 0f667b7668ae..06c6a2752677 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, ParameterConvertible, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, 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 0eadfe3042ae..aeab3b15a102 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, ParameterConvertible, Hashable { +public struct Model200Response: Sendable, Codable, 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 82bba99bf668..4f6830570025 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, ParameterConvertible, Hashable { +public struct Name: Sendable, Codable, 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 05bd45180b0c..3621d67757e9 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, ParameterConvertible, Hashable { +public struct NumberOnly: Sendable, Codable, 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 9f2556d6c0e3..bf2137d27a16 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, ParameterConvertible, Hashable { +public struct Order: Sendable, Codable, 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 34a4ed7b12e9..5893a2807418 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, ParameterConvertible, Hashable { +public struct OuterComposite: Sendable, Codable, 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 cd28268b345c..5e9084ec2ef2 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, ParameterConvertible, Hashable { +public struct Pet: Sendable, Codable, 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 5d6c8a6c9cf2..fd389ad1422d 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, ParameterConvertible, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, 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 c2a1b7f73c83..2fd94d66e2ab 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, ParameterConvertible, Hashable { +public struct Return: Sendable, Codable, 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 000b39a8a136..95c7afe37e25 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, ParameterConvertible, Hashable { +public struct SpecialModelName: Sendable, Codable, 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 0ec7c4862086..50ecf3d40383 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, ParameterConvertible, Hashable { +public struct StringBooleanMap: Sendable, Codable, 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 df5505fc4bcb..510c09ab0201 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, ParameterConvertible, Hashable { +public struct Tag: Sendable, Codable, 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 459e3c03da41..0824151955c3 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, ParameterConvertible, Hashable { +public struct TypeHolderDefault: Sendable, Codable, 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 628ca869217f..437e8d3a7a02 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, ParameterConvertible, Hashable { +public struct TypeHolderExample: Sendable, Codable, 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 33fa97c11eb4..f012dafe19c6 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, ParameterConvertible, Hashable { +public struct User: Sendable, Codable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index fc0b544a05c3..68e48268d1b7 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 @@ -49,8 +49,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -95,15 +97,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 4bf7be0f2491..e15887fc3585 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, 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 e2e0e01546a9..846d0bffd42e 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, ParameterConvertible, Hashable { +public struct Animal: Sendable, Codable, 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 3e6a6f952ee1..5f8cfe3d5102 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, ParameterConvertible, Hashable { +public struct ApiResponse: Sendable, Codable, 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 5e7b7650f855..63dfb69bbabb 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, ParameterConvertible, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, 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 abe8c9ea8568..3ed50f5074e1 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, ParameterConvertible, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, 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 1f24ed5e7315..652ad17e7778 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, ParameterConvertible, Hashable { +public struct ArrayTest: Sendable, Codable, 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 090b3a75515d..a86eb5e7cc3f 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, ParameterConvertible, Hashable { +public struct Capitalization: Sendable, Codable, 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 36a552d208d5..f4b05d09080b 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, ParameterConvertible, Hashable { +public struct Cat: Sendable, Codable, 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 66785088d3dd..64f4cbd29125 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, ParameterConvertible, Hashable { +public struct Category: Sendable, Codable, 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 4e9a2272ef78..559a00895906 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, ParameterConvertible, Hashable { +public struct ClassModel: Sendable, Codable, 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 71fe46ac1bd8..171b4da0eca7 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, ParameterConvertible, Hashable { +public struct Client: Sendable, Codable, 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 134cc4ad51f5..d48f9e70e605 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, ParameterConvertible, Hashable { +public struct Dog: Sendable, Codable, 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 4f7b547df685..935594d56b5e 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, ParameterConvertible, Hashable { +public struct EnumArrays: Sendable, Codable, 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 9472c599e8be..a21aa87d0e5e 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, ParameterConvertible, Hashable { +public struct EnumTest: Sendable, Codable, 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 2b1d20efb35e..7360adbc0a29 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, ParameterConvertible, Hashable { +public struct File: Sendable, Codable, 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 528709b3c7e9..54afadae66b5 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, ParameterConvertible, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, 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 695d9a443588..fe06e48fa23a 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, ParameterConvertible, Hashable { +public struct FormatTest: Sendable, Codable, 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 850da288bf0d..5b5fe48fb7e5 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, ParameterConvertible, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, 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 415ef215291e..78e1feb2beff 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, ParameterConvertible, Hashable { +public struct List: Sendable, Codable, 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 b373fbe82924..6420157b29ae 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, ParameterConvertible, Hashable { +public struct MapTest: Sendable, Codable, 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 0f667b7668ae..06c6a2752677 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, ParameterConvertible, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, 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 0eadfe3042ae..aeab3b15a102 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, ParameterConvertible, Hashable { +public struct Model200Response: Sendable, Codable, 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 82bba99bf668..4f6830570025 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, ParameterConvertible, Hashable { +public struct Name: Sendable, Codable, 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 05bd45180b0c..3621d67757e9 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, ParameterConvertible, Hashable { +public struct NumberOnly: Sendable, Codable, 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 9f2556d6c0e3..bf2137d27a16 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, ParameterConvertible, Hashable { +public struct Order: Sendable, Codable, 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 34a4ed7b12e9..5893a2807418 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, ParameterConvertible, Hashable { +public struct OuterComposite: Sendable, Codable, 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 cd28268b345c..5e9084ec2ef2 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, ParameterConvertible, Hashable { +public struct Pet: Sendable, Codable, 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 5d6c8a6c9cf2..fd389ad1422d 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, ParameterConvertible, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, 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 c2a1b7f73c83..2fd94d66e2ab 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, ParameterConvertible, Hashable { +public struct Return: Sendable, Codable, 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 000b39a8a136..95c7afe37e25 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, ParameterConvertible, Hashable { +public struct SpecialModelName: Sendable, Codable, 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 0ec7c4862086..50ecf3d40383 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, ParameterConvertible, Hashable { +public struct StringBooleanMap: Sendable, Codable, 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 df5505fc4bcb..510c09ab0201 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, ParameterConvertible, Hashable { +public struct Tag: Sendable, Codable, 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 459e3c03da41..0824151955c3 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, ParameterConvertible, Hashable { +public struct TypeHolderDefault: Sendable, Codable, 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 628ca869217f..437e8d3a7a02 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, ParameterConvertible, Hashable { +public struct TypeHolderExample: Sendable, Codable, 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 33fa97c11eb4..f012dafe19c6 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, ParameterConvertible, Hashable { +public struct User: Sendable, Codable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift index fc0b544a05c3..68e48268d1b7 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift @@ -49,8 +49,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -95,15 +97,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 4bf7be0f2491..e15887fc3585 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, 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 e2e0e01546a9..846d0bffd42e 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, ParameterConvertible, Hashable { +public struct Animal: Sendable, Codable, 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 3e6a6f952ee1..5f8cfe3d5102 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, ParameterConvertible, Hashable { +public struct ApiResponse: Sendable, Codable, 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 5e7b7650f855..63dfb69bbabb 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, ParameterConvertible, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, 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 abe8c9ea8568..3ed50f5074e1 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, ParameterConvertible, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, 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 1f24ed5e7315..652ad17e7778 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, ParameterConvertible, Hashable { +public struct ArrayTest: Sendable, Codable, 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 090b3a75515d..a86eb5e7cc3f 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, ParameterConvertible, Hashable { +public struct Capitalization: Sendable, Codable, 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 36a552d208d5..f4b05d09080b 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, ParameterConvertible, Hashable { +public struct Cat: Sendable, Codable, 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 66785088d3dd..64f4cbd29125 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, ParameterConvertible, Hashable { +public struct Category: Sendable, Codable, 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 4e9a2272ef78..559a00895906 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, ParameterConvertible, Hashable { +public struct ClassModel: Sendable, Codable, 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 71fe46ac1bd8..171b4da0eca7 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, ParameterConvertible, Hashable { +public struct Client: Sendable, Codable, 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 134cc4ad51f5..d48f9e70e605 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, ParameterConvertible, Hashable { +public struct Dog: Sendable, Codable, 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 4f7b547df685..935594d56b5e 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, ParameterConvertible, Hashable { +public struct EnumArrays: Sendable, Codable, 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 9472c599e8be..a21aa87d0e5e 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, ParameterConvertible, Hashable { +public struct EnumTest: Sendable, Codable, 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 2b1d20efb35e..7360adbc0a29 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, ParameterConvertible, Hashable { +public struct File: Sendable, Codable, 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 528709b3c7e9..54afadae66b5 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, ParameterConvertible, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, 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 695d9a443588..fe06e48fa23a 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, ParameterConvertible, Hashable { +public struct FormatTest: Sendable, Codable, 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 850da288bf0d..5b5fe48fb7e5 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, ParameterConvertible, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, 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 415ef215291e..78e1feb2beff 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, ParameterConvertible, Hashable { +public struct List: Sendable, Codable, 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 b373fbe82924..6420157b29ae 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, ParameterConvertible, Hashable { +public struct MapTest: Sendable, Codable, 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 0f667b7668ae..06c6a2752677 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, ParameterConvertible, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, 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 0eadfe3042ae..aeab3b15a102 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, ParameterConvertible, Hashable { +public struct Model200Response: Sendable, Codable, 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 82bba99bf668..4f6830570025 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, ParameterConvertible, Hashable { +public struct Name: Sendable, Codable, 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 05bd45180b0c..3621d67757e9 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, ParameterConvertible, Hashable { +public struct NumberOnly: Sendable, Codable, 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 9f2556d6c0e3..bf2137d27a16 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, ParameterConvertible, Hashable { +public struct Order: Sendable, Codable, 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 34a4ed7b12e9..5893a2807418 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, ParameterConvertible, Hashable { +public struct OuterComposite: Sendable, Codable, 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 cd28268b345c..5e9084ec2ef2 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, ParameterConvertible, Hashable { +public struct Pet: Sendable, Codable, 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 5d6c8a6c9cf2..fd389ad1422d 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, ParameterConvertible, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, 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 c2a1b7f73c83..2fd94d66e2ab 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, ParameterConvertible, Hashable { +public struct Return: Sendable, Codable, 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 000b39a8a136..95c7afe37e25 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, ParameterConvertible, Hashable { +public struct SpecialModelName: Sendable, Codable, 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 0ec7c4862086..50ecf3d40383 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, ParameterConvertible, Hashable { +public struct StringBooleanMap: Sendable, Codable, 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 df5505fc4bcb..510c09ab0201 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, ParameterConvertible, Hashable { +public struct Tag: Sendable, Codable, 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 459e3c03da41..0824151955c3 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, ParameterConvertible, Hashable { +public struct TypeHolderDefault: Sendable, Codable, 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 628ca869217f..437e8d3a7a02 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, ParameterConvertible, Hashable { +public struct TypeHolderExample: Sendable, Codable, 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 33fa97c11eb4..f012dafe19c6 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, ParameterConvertible, Hashable { +public struct User: Sendable, Codable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift index fc0b544a05c3..68e48268d1b7 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -49,8 +49,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -95,15 +97,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 75d1d8866225..73af7c62a61e 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesAnyType: Sendable, Codable, 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 5a41eccf3bb9..2f347ca1c8e6 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesArray: Sendable, Codable, 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 434dce35805b..b49767cdd8d4 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesBoolean: Sendable, Codable, 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 c1c971c78d8b..225ae4672d1f 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, 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 8a3963260d62..c2e8eb2e48d2 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesInteger: Sendable, Codable, 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 d427a6fe0ddc..436216e5e5b9 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesNumber: Sendable, Codable, 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 d5b428434f79..621754061f39 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesObject: Sendable, Codable, 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 ef5442bd361a..9108687309a1 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesString: Sendable, Codable, 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 e2e0e01546a9..846d0bffd42e 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, ParameterConvertible, Hashable { +public struct Animal: Sendable, Codable, 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 3e6a6f952ee1..5f8cfe3d5102 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, ParameterConvertible, Hashable { +public struct ApiResponse: Sendable, Codable, 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 5e7b7650f855..63dfb69bbabb 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, ParameterConvertible, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, 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 abe8c9ea8568..3ed50f5074e1 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, ParameterConvertible, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, 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 1f24ed5e7315..652ad17e7778 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, ParameterConvertible, Hashable { +public struct ArrayTest: Sendable, Codable, 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 7f415f6f6997..04eea575333c 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, ParameterConvertible, Hashable { +public struct BigCat: Sendable, Codable, 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 090b3a75515d..a86eb5e7cc3f 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, ParameterConvertible, Hashable { +public struct Capitalization: Sendable, Codable, 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 36a552d208d5..f4b05d09080b 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, ParameterConvertible, Hashable { +public struct Cat: Sendable, Codable, 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 0bad47596655..43c83629acd6 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, ParameterConvertible, Hashable { +public struct Category: Sendable, Codable, 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 4e9a2272ef78..559a00895906 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, ParameterConvertible, Hashable { +public struct ClassModel: Sendable, Codable, 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 71fe46ac1bd8..171b4da0eca7 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, ParameterConvertible, Hashable { +public struct Client: Sendable, Codable, 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 134cc4ad51f5..d48f9e70e605 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, ParameterConvertible, Hashable { +public struct Dog: Sendable, Codable, 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 4f7b547df685..935594d56b5e 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, ParameterConvertible, Hashable { +public struct EnumArrays: Sendable, Codable, 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 9472c599e8be..a21aa87d0e5e 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, ParameterConvertible, Hashable { +public struct EnumTest: Sendable, Codable, 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 2b1d20efb35e..7360adbc0a29 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, ParameterConvertible, Hashable { +public struct File: Sendable, Codable, 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 528709b3c7e9..54afadae66b5 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, ParameterConvertible, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, 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 d6cbe3eb90a4..79488497d087 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, ParameterConvertible, Hashable { +public struct FormatTest: Sendable, Codable, 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 850da288bf0d..5b5fe48fb7e5 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, ParameterConvertible, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, 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 415ef215291e..78e1feb2beff 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, ParameterConvertible, Hashable { +public struct List: Sendable, Codable, 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 b373fbe82924..6420157b29ae 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, ParameterConvertible, Hashable { +public struct MapTest: Sendable, Codable, 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 0f667b7668ae..06c6a2752677 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, ParameterConvertible, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, 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 0eadfe3042ae..aeab3b15a102 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, ParameterConvertible, Hashable { +public struct Model200Response: Sendable, Codable, 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 83d0531d4a2e..9db2b38be89b 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, ParameterConvertible, Hashable { +public struct Name: Sendable, Codable, 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 05bd45180b0c..3621d67757e9 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, ParameterConvertible, Hashable { +public struct NumberOnly: Sendable, Codable, 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 eee7fff62269..a9ae02be7735 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, ParameterConvertible, Hashable { +public struct Order: Sendable, Codable, 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 34a4ed7b12e9..5893a2807418 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, ParameterConvertible, Hashable { +public struct OuterComposite: Sendable, Codable, 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 90f765ada160..94679ba5af85 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, ParameterConvertible, Hashable { +public struct Pet: Sendable, Codable, 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 5d6c8a6c9cf2..fd389ad1422d 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, ParameterConvertible, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, 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 c2a1b7f73c83..2fd94d66e2ab 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, ParameterConvertible, Hashable { +public struct Return: Sendable, Codable, 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 000b39a8a136..95c7afe37e25 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, ParameterConvertible, Hashable { +public struct SpecialModelName: Sendable, Codable, 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 0ec7c4862086..50ecf3d40383 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, ParameterConvertible, Hashable { +public struct StringBooleanMap: Sendable, Codable, 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 df5505fc4bcb..510c09ab0201 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, ParameterConvertible, Hashable { +public struct Tag: Sendable, Codable, 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 459e3c03da41..0824151955c3 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, ParameterConvertible, Hashable { +public struct TypeHolderDefault: Sendable, Codable, 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 f0f7c6977046..a74e310e0750 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, ParameterConvertible, Hashable { +public struct TypeHolderExample: Sendable, Codable, 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 33fa97c11eb4..f012dafe19c6 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, ParameterConvertible, Hashable { +public struct User: Sendable, Codable, 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 d20d4957458d..e05318fb7e24 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, ParameterConvertible, Hashable { +public struct XmlItem: Sendable, Codable, Hashable { public var attributeString: String? public var attributeNumber: Double? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift index fc0b544a05c3..68e48268d1b7 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -49,8 +49,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -95,15 +97,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 896d23b3a2dc..67363bd51bb6 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, ParameterConvertible { +@objcMembers public class AdditionalPropertiesClass: NSObject, Codable { 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 82e821c36f83..73979b9c7dfa 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, ParameterConvertible { +@objcMembers public class Animal: NSObject, Codable { 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 a05ab02614ec..99c3cc011f9a 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, ParameterConvertible { +@objcMembers public class ApiResponse: NSObject, Codable { 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 bdbc9cab6475..d99f7676974d 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, ParameterConvertible { +@objcMembers public class ArrayOfArrayOfNumberOnly: NSObject, Codable { 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 2df4df84fa06..8995bbdf2d72 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, ParameterConvertible { +@objcMembers public class ArrayOfNumberOnly: NSObject, Codable { 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 7a813d8ce54e..03e4b517b264 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, ParameterConvertible { +@objcMembers public class ArrayTest: NSObject, Codable { 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 81f60741bdcb..c37099bfb486 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, ParameterConvertible { +@objcMembers public class Capitalization: NSObject, Codable { 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 55ce7c4438b2..4c5ac7fbc90a 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, ParameterConvertible { +@objcMembers public class Cat: NSObject, Codable { 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 7a173007acdc..96fcaff3d401 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, ParameterConvertible { +@objcMembers public class Category: NSObject, Codable { 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 ada6601da427..4978f212ac10 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, ParameterConvertible { +@objcMembers public class ClassModel: NSObject, Codable { 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 64655ce12652..dbad08f4cee0 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, ParameterConvertible { +@objcMembers public class Client: NSObject, Codable { 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 29db23798bc0..972028f8d87b 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, ParameterConvertible { +@objcMembers public class Dog: NSObject, Codable { 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 fbcde5b6a577..93e9af26ba6a 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, ParameterConvertible { +@objcMembers public class EnumArrays: NSObject, Codable { 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 d8c630d29d31..278e6c8b751a 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, ParameterConvertible { +@objcMembers public class EnumTest: NSObject, Codable { 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 2f5b7ca8c2f9..c8cb3ec9ca5a 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, ParameterConvertible { +@objcMembers public class File: NSObject, Codable { /** 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 b998c3d1863a..678e7dc717e2 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, ParameterConvertible { +@objcMembers public class FileSchemaTestClass: NSObject, Codable { 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 b7b2aa8305ee..2a229371bf2e 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, ParameterConvertible { +@objcMembers public class FormatTest: NSObject, Codable { 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 ba89f4a0aedf..5539b28b047e 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, ParameterConvertible { +@objcMembers public class HasOnlyReadOnly: NSObject, Codable { 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 4dcea67b6bff..437e6e295793 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, ParameterConvertible { +@objcMembers public class List: NSObject, Codable { 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 3cf4206d3f99..9a3a4c6f0ab9 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, ParameterConvertible { +@objcMembers public class MapTest: NSObject, Codable { 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 31a688b29904..3c209dadf694 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, ParameterConvertible { +@objcMembers public class MixedPropertiesAndAdditionalPropertiesClass: NSObject, Codable { 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 6d887505ef56..01417dc973db 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, ParameterConvertible { +@objcMembers public class Model200Response: NSObject, Codable { 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 326d2c671ecc..ea194f23abe9 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, ParameterConvertible { +@objcMembers public class Name: NSObject, Codable { 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 39b81dc28e68..0bf7187db5ab 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, ParameterConvertible { +@objcMembers public class NumberOnly: NSObject, Codable { 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 a0b91baaf927..0a73b6782855 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, ParameterConvertible { +@objcMembers public class Order: NSObject, Codable { 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 74fc46acdbda..6eecc41fd8b2 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, ParameterConvertible { +@objcMembers public class OuterComposite: NSObject, Codable { 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 31c4330a7d54..f41187772fb9 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, ParameterConvertible { +@objcMembers public class Pet: NSObject, Codable { 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 1ab05a9aebb7..e7df6a5b1164 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, ParameterConvertible { +@objcMembers public class ReadOnlyFirst: NSObject, Codable { 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 86442acc9e2e..d832278eb61f 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, ParameterConvertible { +@objcMembers public class Return: NSObject, Codable { 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 1defae54ac05..33a6e621028c 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, ParameterConvertible { +@objcMembers public class SpecialModelName: NSObject, Codable { 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 dc4db21b3b3a..a3240d3e3724 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, ParameterConvertible { +@objcMembers public class StringBooleanMap: NSObject, Codable { 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 48903425059f..51a4111dbce4 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, ParameterConvertible { +@objcMembers public class Tag: NSObject, Codable { 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 f47928cb2ede..c5f3a002a8ad 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, ParameterConvertible { +@objcMembers public class TypeHolderDefault: NSObject, Codable { 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 45c9eb19155b..36ddbd26f366 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, ParameterConvertible { +@objcMembers public class TypeHolderExample: NSObject, Codable { 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 1c564a7f0b8c..434186d6edb2 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, ParameterConvertible { +@objcMembers public class User: NSObject, Codable { public var _id: Int64? public var _idNum: NSNumber? { diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index fc0b544a05c3..68e48268d1b7 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 @@ -49,8 +49,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -95,15 +97,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 f4a1981f965a..df4ed00e2665 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, ParameterConvertible, Hashable { +public struct Apple: Sendable, Codable, 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 cc56410c7cfd..85850cf42421 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, ParameterConvertible, Hashable { +public struct Banana: Sendable, Codable, 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 ab4723c3a069..14ab723afe30 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, ParameterConvertible, Hashable { +public enum Fruit: Sendable, Codable, Hashable { case typeApple(Apple) case typeBanana(Banana) diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index 6b6bf2d2b5a7..2b6269d34a6b 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 @@ -50,8 +50,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -96,15 +98,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 4bf7be0f2491..e15887fc3585 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, 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 e2e0e01546a9..846d0bffd42e 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, ParameterConvertible, Hashable { +public struct Animal: Sendable, Codable, 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 3e6a6f952ee1..5f8cfe3d5102 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, ParameterConvertible, Hashable { +public struct ApiResponse: Sendable, Codable, 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 5e7b7650f855..63dfb69bbabb 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, ParameterConvertible, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, 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 abe8c9ea8568..3ed50f5074e1 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, ParameterConvertible, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, 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 1f24ed5e7315..652ad17e7778 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, ParameterConvertible, Hashable { +public struct ArrayTest: Sendable, Codable, 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 090b3a75515d..a86eb5e7cc3f 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, ParameterConvertible, Hashable { +public struct Capitalization: Sendable, Codable, 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 36a552d208d5..f4b05d09080b 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, ParameterConvertible, Hashable { +public struct Cat: Sendable, Codable, 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 66785088d3dd..64f4cbd29125 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, ParameterConvertible, Hashable { +public struct Category: Sendable, Codable, 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 4e9a2272ef78..559a00895906 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, ParameterConvertible, Hashable { +public struct ClassModel: Sendable, Codable, 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 71fe46ac1bd8..171b4da0eca7 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, ParameterConvertible, Hashable { +public struct Client: Sendable, Codable, 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 134cc4ad51f5..d48f9e70e605 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, ParameterConvertible, Hashable { +public struct Dog: Sendable, Codable, 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 4f7b547df685..935594d56b5e 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, ParameterConvertible, Hashable { +public struct EnumArrays: Sendable, Codable, 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 9472c599e8be..a21aa87d0e5e 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, ParameterConvertible, Hashable { +public struct EnumTest: Sendable, Codable, 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 2b1d20efb35e..7360adbc0a29 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, ParameterConvertible, Hashable { +public struct File: Sendable, Codable, 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 528709b3c7e9..54afadae66b5 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, ParameterConvertible, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, 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 695d9a443588..fe06e48fa23a 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, ParameterConvertible, Hashable { +public struct FormatTest: Sendable, Codable, 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 850da288bf0d..5b5fe48fb7e5 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, ParameterConvertible, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, 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 415ef215291e..78e1feb2beff 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, ParameterConvertible, Hashable { +public struct List: Sendable, Codable, 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 b373fbe82924..6420157b29ae 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, ParameterConvertible, Hashable { +public struct MapTest: Sendable, Codable, 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 0f667b7668ae..06c6a2752677 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, ParameterConvertible, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, 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 0eadfe3042ae..aeab3b15a102 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, ParameterConvertible, Hashable { +public struct Model200Response: Sendable, Codable, 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 82bba99bf668..4f6830570025 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, ParameterConvertible, Hashable { +public struct Name: Sendable, Codable, 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 05bd45180b0c..3621d67757e9 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, ParameterConvertible, Hashable { +public struct NumberOnly: Sendable, Codable, 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 9f2556d6c0e3..bf2137d27a16 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, ParameterConvertible, Hashable { +public struct Order: Sendable, Codable, 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 34a4ed7b12e9..5893a2807418 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, ParameterConvertible, Hashable { +public struct OuterComposite: Sendable, Codable, 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 cd28268b345c..5e9084ec2ef2 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, ParameterConvertible, Hashable { +public struct Pet: Sendable, Codable, 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 5d6c8a6c9cf2..fd389ad1422d 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, ParameterConvertible, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, 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 c2a1b7f73c83..2fd94d66e2ab 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, ParameterConvertible, Hashable { +public struct Return: Sendable, Codable, 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 000b39a8a136..95c7afe37e25 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, ParameterConvertible, Hashable { +public struct SpecialModelName: Sendable, Codable, 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 0ec7c4862086..50ecf3d40383 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, ParameterConvertible, Hashable { +public struct StringBooleanMap: Sendable, Codable, 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 df5505fc4bcb..510c09ab0201 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, ParameterConvertible, Hashable { +public struct Tag: Sendable, Codable, 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 459e3c03da41..0824151955c3 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, ParameterConvertible, Hashable { +public struct TypeHolderDefault: Sendable, Codable, 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 628ca869217f..437e8d3a7a02 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, ParameterConvertible, Hashable { +public struct TypeHolderExample: Sendable, Codable, 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 33fa97c11eb4..f012dafe19c6 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, ParameterConvertible, Hashable { +public struct User: Sendable, Codable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index 40c9dc152409..83bf06577d98 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 @@ -49,8 +49,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -95,15 +97,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 5fe1c0a0f453..c9dedfddee9a 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, ParameterConvertible { +internal struct AdditionalPropertiesClass: Sendable, Codable { 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 3ba560bd83de..667d7f1ec772 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, ParameterConvertible { +internal struct Animal: Sendable, Codable { 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 3fc6a400ad97..8f3170f74ac4 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, ParameterConvertible { +internal struct ApiResponse: Sendable, Codable { 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 2b0c435cc55e..aa098eb2c537 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, ParameterConvertible { +internal struct ArrayOfArrayOfNumberOnly: Sendable, Codable { 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 972657e56a6f..1dae1afc9282 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, ParameterConvertible { +internal struct ArrayOfNumberOnly: Sendable, Codable { 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 9d2c5040710d..921a8d716331 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, ParameterConvertible { +internal struct ArrayTest: Sendable, Codable { 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 412fbe83f63b..0679eb0c69fc 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, ParameterConvertible { +internal struct Capitalization: Sendable, Codable { 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 1bcf33e81179..01f3a520ecfe 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, ParameterConvertible { +internal struct Cat: Sendable, Codable { 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 bc2243b39188..518c5fad933d 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, ParameterConvertible, Hashable { +internal struct Category: Sendable, Codable, 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 b161ee5361e8..afc40340ea5c 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, ParameterConvertible { +internal struct ClassModel: Sendable, Codable { 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 ddf25d10d8b2..9a4041815a67 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, ParameterConvertible { +internal struct Client: Sendable, Codable { 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 7643447af78a..17b21c5b14d4 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, ParameterConvertible { +internal struct Dog: Sendable, Codable { 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 564b83215377..8c65df7075e2 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, ParameterConvertible { +internal struct EnumArrays: Sendable, Codable { 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 380f8a56187c..ff294a0d3793 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, ParameterConvertible { +internal struct EnumTest: Sendable, Codable { 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 ed8a14518ad9..20fcd8e79c89 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, ParameterConvertible { +internal struct File: Sendable, Codable { /** 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 ee3ce88b2f20..1cf4b424574a 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, ParameterConvertible { +internal struct FileSchemaTestClass: Sendable, Codable { 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 e0ed0dd4601f..aa34c8eb6d08 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, ParameterConvertible { +internal struct FormatTest: Sendable, Codable { 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 da206ba77319..983169c74a49 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, ParameterConvertible { +internal struct HasOnlyReadOnly: Sendable, Codable { 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 cfa8e12a3c2a..c276123377dc 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, ParameterConvertible { +internal struct List: Sendable, Codable { 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 1d038801700d..01d2c81bb457 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, ParameterConvertible { +internal struct MapTest: Sendable, Codable { 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 d6b825a01679..6f152e9c5d8b 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, ParameterConvertible { +internal struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable { 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 27450bb544ac..8f6915565e95 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, ParameterConvertible { +internal struct Model200Response: Sendable, Codable { 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 dc0260c62e77..af208c2696c3 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, ParameterConvertible { +internal struct Name: Sendable, Codable { 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 2976cb930a28..34824d02341d 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, ParameterConvertible { +internal struct NumberOnly: Sendable, Codable { 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 1fa0b8dda242..d794422d7b85 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, ParameterConvertible { +internal struct Order: Sendable, Codable { 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 dae651722737..5ab48176fad2 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, ParameterConvertible { +internal struct OuterComposite: Sendable, Codable { 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 f8a0b6f0e7f2..836a2387b090 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, ParameterConvertible, Hashable { +internal struct Pet: Sendable, Codable, 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 f6aefb3f4bcf..c0bf5330b5c1 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, ParameterConvertible { +internal struct ReadOnlyFirst: Sendable, Codable { 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 4dcfd5327319..c42ef4a95e61 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, ParameterConvertible { +internal struct Return: Sendable, Codable { 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 163fcde60241..d81bbaa21fd3 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, ParameterConvertible { +internal struct SpecialModelName: Sendable, Codable { 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 b645db9803be..53fa34f2a451 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, ParameterConvertible { +internal struct StringBooleanMap: Sendable, Codable { 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 490073c7dad0..08d6b28b9ef0 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, ParameterConvertible, Hashable { +internal struct Tag: Sendable, Codable, 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 fea989da078f..c5a36d9481a6 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, ParameterConvertible { +internal struct TypeHolderDefault: Sendable, Codable { 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 ea42cc7a5ada..9489434beb35 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, ParameterConvertible { +internal struct TypeHolderExample: Sendable, Codable { 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 4f8f822838c5..3664e7153bb9 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, ParameterConvertible { +internal struct User: Sendable, Codable { internal private(set) var id: Int64? internal private(set) var username: String? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index fff56a53eec2..cf8f9b535e20 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 @@ -49,8 +49,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -94,12 +96,3 @@ extension Date: ParameterConvertible { return codableHelper.dateFormatter.string(from: self) } } - -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} 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 4bf7be0f2491..e15887fc3585 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, ParameterConvertible, Hashable { +public struct AdditionalPropertiesClass: Sendable, Codable, 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 e2e0e01546a9..846d0bffd42e 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, ParameterConvertible, Hashable { +public struct Animal: Sendable, Codable, 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 3e6a6f952ee1..5f8cfe3d5102 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, ParameterConvertible, Hashable { +public struct ApiResponse: Sendable, Codable, 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 5e7b7650f855..63dfb69bbabb 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, ParameterConvertible, Hashable { +public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, 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 abe8c9ea8568..3ed50f5074e1 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, ParameterConvertible, Hashable { +public struct ArrayOfNumberOnly: Sendable, Codable, 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 1f24ed5e7315..652ad17e7778 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, ParameterConvertible, Hashable { +public struct ArrayTest: Sendable, Codable, 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 090b3a75515d..a86eb5e7cc3f 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, ParameterConvertible, Hashable { +public struct Capitalization: Sendable, Codable, 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 36a552d208d5..f4b05d09080b 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, ParameterConvertible, Hashable { +public struct Cat: Sendable, Codable, 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 66785088d3dd..64f4cbd29125 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, ParameterConvertible, Hashable { +public struct Category: Sendable, Codable, 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 4e4d4a202b7a..a951d4971d30 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, ParameterConvertible, Hashable { +public struct ClassModel: Sendable, Codable, 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 71fe46ac1bd8..171b4da0eca7 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, ParameterConvertible, Hashable { +public struct Client: Sendable, Codable, 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 134cc4ad51f5..d48f9e70e605 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, ParameterConvertible, Hashable { +public struct Dog: Sendable, Codable, 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 4f7b547df685..935594d56b5e 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, ParameterConvertible, Hashable { +public struct EnumArrays: Sendable, Codable, 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 9472c599e8be..a21aa87d0e5e 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, ParameterConvertible, Hashable { +public struct EnumTest: Sendable, Codable, 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 2b1d20efb35e..7360adbc0a29 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, ParameterConvertible, Hashable { +public struct File: Sendable, Codable, 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 528709b3c7e9..54afadae66b5 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, ParameterConvertible, Hashable { +public struct FileSchemaTestClass: Sendable, Codable, 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 695d9a443588..fe06e48fa23a 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, ParameterConvertible, Hashable { +public struct FormatTest: Sendable, Codable, 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 850da288bf0d..5b5fe48fb7e5 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, ParameterConvertible, Hashable { +public struct HasOnlyReadOnly: Sendable, Codable, 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 415ef215291e..78e1feb2beff 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, ParameterConvertible, Hashable { +public struct List: Sendable, Codable, 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 b373fbe82924..6420157b29ae 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, ParameterConvertible, Hashable { +public struct MapTest: Sendable, Codable, 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 0f667b7668ae..06c6a2752677 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, ParameterConvertible, Hashable { +public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, 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 121c8c7cde1a..8e272081f503 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, ParameterConvertible, Hashable { +public struct Model200Response: Sendable, Codable, 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 82bba99bf668..4f6830570025 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, ParameterConvertible, Hashable { +public struct Name: Sendable, Codable, 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 05bd45180b0c..3621d67757e9 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, ParameterConvertible, Hashable { +public struct NumberOnly: Sendable, Codable, 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 9f2556d6c0e3..bf2137d27a16 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, ParameterConvertible, Hashable { +public struct Order: Sendable, Codable, 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 34a4ed7b12e9..5893a2807418 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, ParameterConvertible, Hashable { +public struct OuterComposite: Sendable, Codable, 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 cd28268b345c..5e9084ec2ef2 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, ParameterConvertible, Hashable { +public struct Pet: Sendable, Codable, 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 5d6c8a6c9cf2..fd389ad1422d 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, ParameterConvertible, Hashable { +public struct ReadOnlyFirst: Sendable, Codable, 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 c8342a75860d..688465aee513 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, ParameterConvertible, Hashable { +public struct Return: Sendable, Codable, 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 000b39a8a136..95c7afe37e25 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, ParameterConvertible, Hashable { +public struct SpecialModelName: Sendable, Codable, 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 ab00378c2280..87748ac59c09 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, ParameterConvertible, Hashable { +public struct StringBooleanMap: Sendable, Codable, 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 df5505fc4bcb..510c09ab0201 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, ParameterConvertible, Hashable { +public struct Tag: Sendable, Codable, 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 459e3c03da41..0824151955c3 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, ParameterConvertible, Hashable { +public struct TypeHolderDefault: Sendable, Codable, 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 628ca869217f..437e8d3a7a02 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, ParameterConvertible, Hashable { +public struct TypeHolderExample: Sendable, Codable, 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 33fa97c11eb4..f012dafe19c6 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, ParameterConvertible, Hashable { +public struct User: Sendable, Codable, Hashable { public var id: Int64? public var username: String? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift index fc0b544a05c3..68e48268d1b7 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift @@ -49,8 +49,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -95,15 +97,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 aa50640ebd25..bd875732936b 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, ParameterConvertible, Hashable { +public final class AdditionalPropertiesClass: @unchecked Sendable, Codable, 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 f04708b45ff2..9c8d741839ea 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, ParameterConvertible, Hashable { +public final class Animal: @unchecked Sendable, Codable, 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 80eaab778864..d5402853b177 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, ParameterConvertible, Hashable { +public final class ApiResponse: @unchecked Sendable, Codable, 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 a38e5ab7ed97..58cf0185e9ca 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, ParameterConvertible, Hashable { +public final class ArrayOfArrayOfNumberOnly: @unchecked Sendable, Codable, 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 b815969e002e..dc915b8b6bc5 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, ParameterConvertible, Hashable { +public final class ArrayOfNumberOnly: @unchecked Sendable, Codable, 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 170a26c5d83c..5239007ffd9b 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, ParameterConvertible, Hashable { +public final class ArrayTest: @unchecked Sendable, Codable, 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 80127924da1c..a6c8cdfbcc32 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, ParameterConvertible, Hashable { +public final class Capitalization: @unchecked Sendable, Codable, 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 80e6dcf6eaa7..55a1b0763d2e 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, ParameterConvertible, Hashable { +public final class Cat: @unchecked Sendable, Codable, 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 c748ccee092f..6214d1c4ae60 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, ParameterConvertible, Hashable { +public final class Category: @unchecked Sendable, Codable, 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 b497879780fd..a816aceec005 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, ParameterConvertible, Hashable { +public final class ClassModel: @unchecked Sendable, Codable, 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 e615fda4516b..27f2a3704cad 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, ParameterConvertible, Hashable { +public final class Client: @unchecked Sendable, Codable, 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 765e53e85aad..7b47b51db0ad 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, ParameterConvertible, Hashable { +public final class Dog: @unchecked Sendable, Codable, 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 7f4f501b6b95..7d5fdec26d54 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, ParameterConvertible, Hashable { +public final class EnumArrays: @unchecked Sendable, Codable, 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 375e78fcb7c3..62374219f544 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, ParameterConvertible, Hashable { +public final class EnumTest: @unchecked Sendable, Codable, 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 e40d2aeb24a4..ca5c36944b93 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, ParameterConvertible, Hashable { +public final class File: @unchecked Sendable, Codable, 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 7b9f6ba92158..78db4e8d1522 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, ParameterConvertible, Hashable { +public final class FileSchemaTestClass: @unchecked Sendable, Codable, 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 68152ec91aca..5765691897d2 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, ParameterConvertible, Hashable { +public final class FormatTest: @unchecked Sendable, Codable, 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 8ddded67ab46..b60c0836b3f3 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, ParameterConvertible, Hashable { +public final class HasOnlyReadOnly: @unchecked Sendable, Codable, 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 9a16b1c0df9b..41bc6a02c590 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, ParameterConvertible, Hashable { +public final class List: @unchecked Sendable, Codable, 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 6a2ca2b24c7f..3841c7b3ffa3 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, ParameterConvertible, Hashable { +public final class MapTest: @unchecked Sendable, Codable, 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 79a449a3fe7c..de7ee77f258e 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, ParameterConvertible, Hashable { +public final class MixedPropertiesAndAdditionalPropertiesClass: @unchecked Sendable, Codable, 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 69d9c6a5704c..62fb10c32c04 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, ParameterConvertible, Hashable { +public final class Model200Response: @unchecked Sendable, Codable, 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 b4ff9f07cfe2..023b723c113a 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, ParameterConvertible, Hashable { +public final class Name: @unchecked Sendable, Codable, 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 c06012fc352a..f00fd2e3406f 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, ParameterConvertible, Hashable { +public final class NumberOnly: @unchecked Sendable, Codable, 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 9da1fff09829..b6099721780b 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, ParameterConvertible, Hashable { +public final class Order: @unchecked Sendable, Codable, 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 0ec0e3401096..aded5bcdd882 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, ParameterConvertible, Hashable { +public final class OuterComposite: @unchecked Sendable, Codable, 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 2753009d4d76..12897bc44ff0 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, ParameterConvertible, Hashable { +public final class Pet: @unchecked Sendable, Codable, 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 c6758a39b58c..25a2f5169139 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, ParameterConvertible, Hashable { +public final class ReadOnlyFirst: @unchecked Sendable, Codable, 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 396aeb14045a..3af5424ab217 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, ParameterConvertible, Hashable { +public final class Return: @unchecked Sendable, Codable, 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 1d827bb0a34e..ead92838f092 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, ParameterConvertible, Hashable { +public final class SpecialModelName: @unchecked Sendable, Codable, 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 d55e96668470..7e828f247925 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, ParameterConvertible, Hashable { +public final class StringBooleanMap: @unchecked Sendable, Codable, 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 50c5568ee986..98727c593bf2 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, ParameterConvertible, Hashable { +public final class Tag: @unchecked Sendable, Codable, 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 d7f0dd16ecdf..8a01979a3b23 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, ParameterConvertible, Hashable { +public final class TypeHolderDefault: @unchecked Sendable, Codable, 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 9d77c797537d..d8a94518ba9c 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, ParameterConvertible, Hashable { +public final class TypeHolderExample: @unchecked Sendable, Codable, 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 94dcce5e71c1..3447b1a8fe26 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, ParameterConvertible, Hashable { +public final class User: @unchecked Sendable, Codable, Hashable { public private(set) var id: Int64? public private(set) var username: String? diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift index fc0b544a05c3..68e48268d1b7 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 @@ -49,8 +49,10 @@ extension UUID: ParameterConvertible { func asParameter(codableHelper: CodableHelper) -> any Sendable { self } } -extension RawRepresentable where RawValue: ParameterConvertible, RawValue: Sendable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { return self.rawValue } +extension RawRepresentable where RawValue: ParameterConvertible { + func asParameter(codableHelper: CodableHelper) -> any Sendable { + rawValue.asParameter(codableHelper: codableHelper) + } } private func encodeIfPossible(_ object: T, codableHelper: CodableHelper) -> any Sendable { @@ -95,15 +97,6 @@ extension Date: ParameterConvertible { } } -extension ParameterConvertible where Self: Encodable { - func asParameter(codableHelper: CodableHelper) -> any Sendable { - guard let data = try? codableHelper.jsonEncoder.encode(self) else { - fatalError("Could not encode to json: \(self)") - } - return data.asParameter(codableHelper: codableHelper) - } -} - extension String: @retroactive CodingKey { public var stringValue: String { 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 b381f6ed1a3f..b693c50fb9e5 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, ParameterConvertible, Hashable { +public struct Banana: Sendable, Codable, 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)