loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[swift6] Add Sendable conformance to structs and enums (#20013)

Browse Source
This commit is contained in:
Lennard Sprong 2024-11-04 12:38:46 +01:00 committed by GitHub
parent 67af02ccc8
commit 00dbe59994
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
447 changed files with 668 additions and 639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/configs/swift6-urlsessionLibrary.yaml
View File

@ -13,4 +13,5 @@ additionalProperties:
useSPMFileStructure: true
mapFileBinaryToData: true
useClasses: true
readonlyProperties: true
swiftUseApiNamespace: true

2
modules/openapi-generator/src/main/resources/swift6/JSONValue.mustache vendored
View File

@ -7,7 +7,7 @@
import Foundation
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum JSONValue: Codable, Hashable {
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum JSONValue: Sendable, Codable, Hashable {
case string(String)
case int(Int)
case double(Double)

2
modules/openapi-generator/src/main/resources/swift6/Models.mustache vendored
View File

@ -44,6 +44,8 @@ extension CaseIterableDefaultsLast {
case encodeValue(Wrapped)
}
extension NullEncodable: Sendable where Wrapped: Sendable {}
extension NullEncodable: Codable where Wrapped: Codable {
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(from decoder: Decoder) throws {
let container = try decoder.singleValueContainer()

2
modules/openapi-generator/src/main/resources/swift6/OpenAPIDateWithoutTime.mustache vendored
View File

@ -15,7 +15,7 @@ import Foundation
/// an appropriate padding in order to transform to GMT+0 which is the assumed timezone in ISO 8601.
/// When decoding, GMT+0 can be assumed (again: ISO8601) so there is no padding necessary and wrappedDate
/// can be used safely.
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct OpenAPIDateWithoutTime: Codable, Hashable, Equatable {
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct OpenAPIDateWithoutTime: Sendable, Codable, Hashable, Equatable {
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let wrappedDate: Date
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let timezone: TimeZone

2
modules/openapi-generator/src/main/resources/swift6/SynchronizedDictionary.mustache vendored
View File

@ -6,7 +6,7 @@
import Foundation
internal struct SynchronizedDictionary<K: Hashable, V> {
internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
private var dictionary = [K: V]()
private let lock = NSRecursiveLock()

2
modules/openapi-generator/src/main/resources/swift6/modelEnum.mustache vendored
View File

@ -1,4 +1,4 @@
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{dataType}}, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}, JSONEncodable{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{/enumUnknownDefaultCase}} {
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{dataType}}, Sendable, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}, JSONEncodable{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{/enumUnknownDefaultCase}} {
{{#allowableValues}}
{{#enumVars}}
case {{{name}}} = {{{value}}}

2
modules/openapi-generator/src/main/resources/swift6/modelInlineEnumDeclaration.mustache vendored
View File

@ -1,4 +1,4 @@
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{enumName}}: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isContainer}}{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}, JSONEncodable{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/isContainer}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{#isContainer}}, CaseIterableDefaultsLast{{/isContainer}}{{/enumUnknownDefaultCase}} {
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{enumName}}: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}, Sendable, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isContainer}}{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}, JSONEncodable{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/isContainer}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{#isContainer}}, CaseIterableDefaultsLast{{/isContainer}}{{/enumUnknownDefaultCase}} {
{{#allowableValues}}
{{#enumVars}}
case {{{name}}} = {{{value}}}

2
modules/openapi-generator/src/main/resources/swift6/modelObject.mustache vendored
View File

@ -1,4 +1,4 @@
{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}: {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{#useJsonEncodable}}, JSONEncodable{{/useJsonEncodable}}{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}: {{^useClasses}}Sendable, {{/useClasses}}{{#useClasses}}{{#readonlyProperties}}@unchecked Sendable, {{/readonlyProperties}}{{/useClasses}}{{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{#useJsonEncodable}}, JSONEncodable{{/useJsonEncodable}}{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
{{/objcCompatible}}{{#objcCompatible}}@objcMembers {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable{{#useJsonEncodable}}, JSONEncodable{{/useJsonEncodable}} {
{{/objcCompatible}}

2
modules/openapi-generator/src/main/resources/swift6/modelOneOf.mustache vendored
View File

@ -1,4 +1,4 @@
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable, JSONEncodable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{/useVapor}} {
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{^useClasses}}Sendable, {{/useClasses}}{{#useClasses}}{{#readonlyProperties}}Sendable, {{/readonlyProperties}}{{/useClasses}}{{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable, JSONEncodable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{/useVapor}} {
{{#oneOf}}
case type{{.}}({{.}})
{{/oneOf}}

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONValue.swift
View File

@ -7,7 +7,7 @@
import Foundation
public enum JSONValue: Codable, Hashable {
public enum JSONValue: Sendable, Codable, Hashable {
case string(String)
case int(Int)
case double(Double)

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Models.swift
View File

@ -44,6 +44,8 @@ public enum NullEncodable<Wrapped: Hashable>: Hashable {
case encodeValue(Wrapped)
}
extension NullEncodable: Sendable where Wrapped: Sendable {}
extension NullEncodable: Codable where Wrapped: Codable {
public init(from decoder: Decoder) throws {
let container = try decoder.singleValueContainer()

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/OpenAPIDateWithoutTime.swift
View File

@ -15,7 +15,7 @@ import Foundation
/// an appropriate padding in order to transform to GMT+0 which is the assumed timezone in ISO 8601.
/// When decoding, GMT+0 can be assumed (again: ISO8601) so there is no padding necessary and wrappedDate
/// can be used safely.
public struct OpenAPIDateWithoutTime: Codable, Hashable, Equatable {
public struct OpenAPIDateWithoutTime: Sendable, Codable, Hashable, Equatable {
public let wrappedDate: Date
public let timezone: TimeZone

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift
View File

@ -6,7 +6,7 @@
import Foundation
internal struct SynchronizedDictionary<K: Hashable, V> {
internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
private var dictionary = [K: V]()
private let lock = NSRecursiveLock()

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct AdditionalPropertiesClass: Codable, JSONEncodable, Hashable {
public struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable {
public var mapString: [String: String]?
public var mapMapString: [String: [String: String]]?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Animal.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Animal: Codable, JSONEncodable, Hashable {
public struct Animal: Sendable, Codable, JSONEncodable, Hashable {
public var className: String
public var color: String? = "red"

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ApiResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ApiResponse: Codable, JSONEncodable, Hashable {
public struct ApiResponse: Sendable, Codable, JSONEncodable, Hashable {
public var code: Int?
public var type: String?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ArrayOfArrayOfNumberOnly: Codable, JSONEncodable, Hashable {
public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable {
public var arrayArrayNumber: [[Double]]?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ArrayOfNumberOnly: Codable, JSONEncodable, Hashable {
public struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable {
public var arrayNumber: [Double]?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayTest.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ArrayTest: Codable, JSONEncodable, Hashable {
public struct ArrayTest: Sendable, Codable, JSONEncodable, Hashable {
public var arrayOfString: [String]?
public var arrayArrayOfInteger: [[Int64]]?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Capitalization.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Capitalization: Codable, JSONEncodable, Hashable {
public struct Capitalization: Sendable, Codable, JSONEncodable, Hashable {
public var smallCamel: String?
public var capitalCamel: String?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Cat.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Cat: Codable, JSONEncodable, Hashable {
public struct Cat: Sendable, Codable, JSONEncodable, Hashable {
public var className: String
public var color: String? = "red"

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Category: Codable, JSONEncodable, Hashable {
public struct Category: Sendable, Codable, JSONEncodable, Hashable {
public var id: Int64?
public var name: String? = "default-name"

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ClassModel.swift
View File

@ -8,7 +8,7 @@
import Foundation
/** Model for testing model with \&quot;_class\&quot; property */
public struct ClassModel: Codable, JSONEncodable, Hashable {
public struct ClassModel: Sendable, Codable, JSONEncodable, Hashable {
public var _class: String?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Client.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Client: Codable, JSONEncodable, Hashable {
public struct Client: Sendable, Codable, JSONEncodable, Hashable {
public var client: String?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Dog.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Dog: Codable, JSONEncodable, Hashable {
public struct Dog: Sendable, Codable, JSONEncodable, Hashable {
public var className: String
public var color: String? = "red"

6
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumArrays.swift
View File

@ -7,13 +7,13 @@
import Foundation
public struct EnumArrays: Codable, JSONEncodable, Hashable {
public struct EnumArrays: Sendable, Codable, JSONEncodable, Hashable {
public enum JustSymbol: String, Codable, CaseIterable {
public enum JustSymbol: String, Sendable, Codable, CaseIterable {
case greaterThanOrEqualTo = ">="
case dollar = "$"
}
public enum ArrayEnum: String, Codable, CaseIterable {
public enum ArrayEnum: String, Sendable, Codable, CaseIterable {
case fish = "fish"
case crab = "crab"
}

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumClass.swift
View File

@ -7,7 +7,7 @@
import Foundation
public enum EnumClass: String, Codable, CaseIterable {
public enum EnumClass: String, Sendable, Codable, CaseIterable {
case abc = "_abc"
case efg = "-efg"
case xyz = "(xyz)"

10
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumTest.swift
View File

@ -7,23 +7,23 @@
import Foundation
public struct EnumTest: Codable, JSONEncodable, Hashable {
public struct EnumTest: Sendable, Codable, JSONEncodable, Hashable {
public enum EnumString: String, Codable, CaseIterable {
public enum EnumString: String, Sendable, Codable, CaseIterable {
case upper = "UPPER"
case lower = "lower"
case empty = ""
}
public enum EnumStringRequired: String, Codable, CaseIterable {
public enum EnumStringRequired: String, Sendable, Codable, CaseIterable {
case upper = "UPPER"
case lower = "lower"
case empty = ""
}
public enum EnumInteger: Int, Codable, CaseIterable {
public enum EnumInteger: Int, Sendable, Codable, CaseIterable {
case _1 = 1
case number1 = -1
}
public enum EnumNumber: Double, Codable, CaseIterable {
public enum EnumNumber: Double, Sendable, Codable, CaseIterable {
case _11 = 1.1
case number12 = -1.2
}

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/File.swift
View File

@ -8,7 +8,7 @@
import Foundation
/** Must be named &#x60;File&#x60; for test. */
public struct File: Codable, JSONEncodable, Hashable {
public struct File: Sendable, Codable, JSONEncodable, Hashable {
/** Test capitalization */
public var sourceURI: String?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct FileSchemaTestClass: Codable, JSONEncodable, Hashable {
public struct FileSchemaTestClass: Sendable, Codable, JSONEncodable, Hashable {
public var file: File?
public var files: [File]?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FormatTest.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct FormatTest: Codable, JSONEncodable, Hashable {
public struct FormatTest: Sendable, Codable, JSONEncodable, Hashable {
static let integerRule = NumericRule<Int>(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil)
static let int32Rule = NumericRule<Int>(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil)

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct HasOnlyReadOnly: Codable, JSONEncodable, Hashable {
public struct HasOnlyReadOnly: Sendable, Codable, JSONEncodable, Hashable {
public var bar: String?
public var foo: String?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/List.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct List: Codable, JSONEncodable, Hashable {
public struct List: Sendable, Codable, JSONEncodable, Hashable {
public var _123list: String?

4
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MapTest.swift
View File

@ -7,9 +7,9 @@
import Foundation
public struct MapTest: Codable, JSONEncodable, Hashable {
public struct MapTest: Sendable, Codable, JSONEncodable, Hashable {
public enum MapOfEnumString: String, Codable, CaseIterable {
public enum MapOfEnumString: String, Sendable, Codable, CaseIterable {
case upper = "UPPER"
case lower = "lower"
}

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct MixedPropertiesAndAdditionalPropertiesClass: Codable, JSONEncodable, Hashable {
public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable {
public var uuid: UUID?
public var dateTime: Date?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Model200Response.swift
View File

@ -8,7 +8,7 @@
import Foundation
/** Model for testing model name starting with number */
public struct Model200Response: Codable, JSONEncodable, Hashable {
public struct Model200Response: Sendable, Codable, JSONEncodable, Hashable {
public var name: Int?
public var _class: String?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Name.swift
View File

@ -8,7 +8,7 @@
import Foundation
/** Model for testing model name same as property name */
public struct Name: Codable, JSONEncodable, Hashable {
public struct Name: Sendable, Codable, JSONEncodable, Hashable {
public var name: Int
public var snakeCase: NullEncodable<Int> = .encodeValue(11033)

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/NumberOnly.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct NumberOnly: Codable, JSONEncodable, Hashable {
public struct NumberOnly: Sendable, Codable, JSONEncodable, Hashable {
public var justNumber: Double?

4
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift
View File

@ -7,9 +7,9 @@
import Foundation
public struct Order: Codable, JSONEncodable, Hashable {
public struct Order: Sendable, Codable, JSONEncodable, Hashable {
public enum Status: String, Codable, CaseIterable {
public enum Status: String, Sendable, Codable, CaseIterable {
case placed = "placed"
case approved = "approved"
case delivered = "delivered"

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterComposite.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct OuterComposite: Codable, JSONEncodable, Hashable {
public struct OuterComposite: Sendable, Codable, JSONEncodable, Hashable {
public var myNumber: Double?
public var myString: String?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterEnum.swift
View File

@ -7,7 +7,7 @@
import Foundation
public enum OuterEnum: String, Codable, CaseIterable {
public enum OuterEnum: String, Sendable, Codable, CaseIterable {
case placed = "placed"
case approved = "approved"
case delivered = "delivered"

4
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift
View File

@ -7,9 +7,9 @@
import Foundation
public struct Pet: Codable, JSONEncodable, Hashable {
public struct Pet: Sendable, Codable, JSONEncodable, Hashable {
public enum Status: String, Codable, CaseIterable {
public enum Status: String, Sendable, Codable, CaseIterable {
case available = "available"
case pending = "pending"
case sold = "sold"

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ReadOnlyFirst: Codable, JSONEncodable, Hashable {
public struct ReadOnlyFirst: Sendable, Codable, JSONEncodable, Hashable {
public var bar: String?
public var baz: String?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Return.swift
View File

@ -8,7 +8,7 @@
import Foundation
/** Model for testing reserved words */
public struct Return: Codable, JSONEncodable, Hashable {
public struct Return: Sendable, Codable, JSONEncodable, Hashable {
public var _return: Int?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct SpecialModelName: Codable, JSONEncodable, Hashable {
public struct SpecialModelName: Sendable, Codable, JSONEncodable, Hashable {
public var specialPropertyName: Int64?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct StringBooleanMap: Codable, JSONEncodable, Hashable {
public struct StringBooleanMap: Sendable, Codable, JSONEncodable, Hashable {
public enum CodingKeys: CodingKey, CaseIterable {

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Tag: Codable, JSONEncodable, Hashable {
public struct Tag: Sendable, Codable, JSONEncodable, Hashable {
public var id: Int64?
public var name: String?

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct TypeHolderDefault: Codable, JSONEncodable, Hashable {
public struct TypeHolderDefault: Sendable, Codable, JSONEncodable, Hashable {
public var stringItem: String = "what"
public var numberItem: Double

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct TypeHolderExample: Codable, JSONEncodable, Hashable {
public struct TypeHolderExample: Sendable, Codable, JSONEncodable, Hashable {
public var stringItem: String
public var numberItem: Double

2
samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct User: Codable, JSONEncodable, Hashable {
public struct User: Sendable, Codable, JSONEncodable, Hashable {
public var id: Int64?
public var username: String?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONValue.swift
View File

@ -7,7 +7,7 @@
import Foundation
public enum JSONValue: Codable, Hashable {
public enum JSONValue: Sendable, Codable, Hashable {
case string(String)
case int(Int)
case double(Double)

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Models.swift
View File

@ -44,6 +44,8 @@ public enum NullEncodable<Wrapped: Hashable>: Hashable {
case encodeValue(Wrapped)
}
extension NullEncodable: Sendable where Wrapped: Sendable {}
extension NullEncodable: Codable where Wrapped: Codable {
public init(from decoder: Decoder) throws {
let container = try decoder.singleValueContainer()

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift
View File

@ -6,7 +6,7 @@
import Foundation
internal struct SynchronizedDictionary<K: Hashable, V> {
internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
private var dictionary = [K: V]()
private let lock = NSRecursiveLock()

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct AdditionalPropertiesClass: Codable, JSONEncodable, Hashable {
public struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable {
public var mapString: [String: String]?
public var mapMapString: [String: [String: String]]?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Animal.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Animal: Codable, JSONEncodable, Hashable {
public struct Animal: Sendable, Codable, JSONEncodable, Hashable {
public var className: String
public var color: String? = "red"

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ApiResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ApiResponse: Codable, JSONEncodable, Hashable {
public struct ApiResponse: Sendable, Codable, JSONEncodable, Hashable {
public var code: Int?
public var type: String?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ArrayOfArrayOfNumberOnly: Codable, JSONEncodable, Hashable {
public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable {
public var arrayArrayNumber: [[Double]]?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ArrayOfNumberOnly: Codable, JSONEncodable, Hashable {
public struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable {
public var arrayNumber: [Double]?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayTest.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ArrayTest: Codable, JSONEncodable, Hashable {
public struct ArrayTest: Sendable, Codable, JSONEncodable, Hashable {
public var arrayOfString: [String]?
public var arrayArrayOfInteger: [[Int64]]?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Capitalization.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Capitalization: Codable, JSONEncodable, Hashable {
public struct Capitalization: Sendable, Codable, JSONEncodable, Hashable {
public var smallCamel: String?
public var capitalCamel: String?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Cat.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Cat: Codable, JSONEncodable, Hashable {
public struct Cat: Sendable, Codable, JSONEncodable, Hashable {
public var className: String
public var color: String? = "red"

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Category: Codable, JSONEncodable, Hashable {
public struct Category: Sendable, Codable, JSONEncodable, Hashable {
public var id: Int64?
public var name: String? = "default-name"

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ClassModel.swift
View File

@ -8,7 +8,7 @@
import Foundation
/** Model for testing model with \&quot;_class\&quot; property */
public struct ClassModel: Codable, JSONEncodable, Hashable {
public struct ClassModel: Sendable, Codable, JSONEncodable, Hashable {
public var _class: String?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Client.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Client: Codable, JSONEncodable, Hashable {
public struct Client: Sendable, Codable, JSONEncodable, Hashable {
public var client: String?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Dog.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Dog: Codable, JSONEncodable, Hashable {
public struct Dog: Sendable, Codable, JSONEncodable, Hashable {
public var className: String
public var color: String? = "red"

6
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumArrays.swift
View File

@ -7,13 +7,13 @@
import Foundation
public struct EnumArrays: Codable, JSONEncodable, Hashable {
public struct EnumArrays: Sendable, Codable, JSONEncodable, Hashable {
public enum JustSymbol: String, Codable, CaseIterable {
public enum JustSymbol: String, Sendable, Codable, CaseIterable {
case greaterThanOrEqualTo = ">="
case dollar = "$"
}
public enum ArrayEnum: String, Codable, CaseIterable {
public enum ArrayEnum: String, Sendable, Codable, CaseIterable {
case fish = "fish"
case crab = "crab"
}

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumClass.swift
View File

@ -7,7 +7,7 @@
import Foundation
public enum EnumClass: String, Codable, CaseIterable {
public enum EnumClass: String, Sendable, Codable, CaseIterable {
case abc = "_abc"
case efg = "-efg"
case xyz = "(xyz)"

10
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumTest.swift
View File

@ -7,23 +7,23 @@
import Foundation
public struct EnumTest: Codable, JSONEncodable, Hashable {
public struct EnumTest: Sendable, Codable, JSONEncodable, Hashable {
public enum EnumString: String, Codable, CaseIterable {
public enum EnumString: String, Sendable, Codable, CaseIterable {
case upper = "UPPER"
case lower = "lower"
case empty = ""
}
public enum EnumStringRequired: String, Codable, CaseIterable {
public enum EnumStringRequired: String, Sendable, Codable, CaseIterable {
case upper = "UPPER"
case lower = "lower"
case empty = ""
}
public enum EnumInteger: Int, Codable, CaseIterable {
public enum EnumInteger: Int, Sendable, Codable, CaseIterable {
case _1 = 1
case number1 = -1
}
public enum EnumNumber: Double, Codable, CaseIterable {
public enum EnumNumber: Double, Sendable, Codable, CaseIterable {
case _11 = 1.1
case number12 = -1.2
}

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/File.swift
View File

@ -8,7 +8,7 @@
import Foundation
/** Must be named &#x60;File&#x60; for test. */
public struct File: Codable, JSONEncodable, Hashable {
public struct File: Sendable, Codable, JSONEncodable, Hashable {
/** Test capitalization */
public var sourceURI: String?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FileSchemaTestClass.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct FileSchemaTestClass: Codable, JSONEncodable, Hashable {
public struct FileSchemaTestClass: Sendable, Codable, JSONEncodable, Hashable {
public var file: File?
public var files: [File]?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FormatTest.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct FormatTest: Codable, JSONEncodable, Hashable {
public struct FormatTest: Sendable, Codable, JSONEncodable, Hashable {
static let integerRule = NumericRule<Int>(minimum: 10, exclusiveMinimum: false, maximum: 100, exclusiveMaximum: false, multipleOf: nil)
static let int32Rule = NumericRule<Int>(minimum: 20, exclusiveMinimum: false, maximum: 200, exclusiveMaximum: false, multipleOf: nil)

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct HasOnlyReadOnly: Codable, JSONEncodable, Hashable {
public struct HasOnlyReadOnly: Sendable, Codable, JSONEncodable, Hashable {
public var bar: String?
public var foo: String?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/List.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct List: Codable, JSONEncodable, Hashable {
public struct List: Sendable, Codable, JSONEncodable, Hashable {
public var _123list: String?

4
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MapTest.swift
View File

@ -7,9 +7,9 @@
import Foundation
public struct MapTest: Codable, JSONEncodable, Hashable {
public struct MapTest: Sendable, Codable, JSONEncodable, Hashable {
public enum MapOfEnumString: String, Codable, CaseIterable {
public enum MapOfEnumString: String, Sendable, Codable, CaseIterable {
case upper = "UPPER"
case lower = "lower"
}

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct MixedPropertiesAndAdditionalPropertiesClass: Codable, JSONEncodable, Hashable {
public struct MixedPropertiesAndAdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable {
public var uuid: UUID?
public var dateTime: Date?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Model200Response.swift
View File

@ -8,7 +8,7 @@
import Foundation
/** Model for testing model name starting with number */
public struct Model200Response: Codable, JSONEncodable, Hashable {
public struct Model200Response: Sendable, Codable, JSONEncodable, Hashable {
public var name: Int?
public var _class: String?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Name.swift
View File

@ -8,7 +8,7 @@
import Foundation
/** Model for testing model name same as property name */
public struct Name: Codable, JSONEncodable, Hashable {
public struct Name: Sendable, Codable, JSONEncodable, Hashable {
public var name: Int
public var snakeCase: NullEncodable<Int> = .encodeValue(11033)

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/NumberOnly.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct NumberOnly: Codable, JSONEncodable, Hashable {
public struct NumberOnly: Sendable, Codable, JSONEncodable, Hashable {
public var justNumber: Double?

4
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift
View File

@ -7,9 +7,9 @@
import Foundation
public struct Order: Codable, JSONEncodable, Hashable {
public struct Order: Sendable, Codable, JSONEncodable, Hashable {
public enum Status: String, Codable, CaseIterable {
public enum Status: String, Sendable, Codable, CaseIterable {
case placed = "placed"
case approved = "approved"
case delivered = "delivered"

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterComposite.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct OuterComposite: Codable, JSONEncodable, Hashable {
public struct OuterComposite: Sendable, Codable, JSONEncodable, Hashable {
public var myNumber: Double?
public var myString: String?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterEnum.swift
View File

@ -7,7 +7,7 @@
import Foundation
public enum OuterEnum: String, Codable, CaseIterable {
public enum OuterEnum: String, Sendable, Codable, CaseIterable {
case placed = "placed"
case approved = "approved"
case delivered = "delivered"

4
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift
View File

@ -7,9 +7,9 @@
import Foundation
public struct Pet: Codable, JSONEncodable, Hashable {
public struct Pet: Sendable, Codable, JSONEncodable, Hashable {
public enum Status: String, Codable, CaseIterable {
public enum Status: String, Sendable, Codable, CaseIterable {
case available = "available"
case pending = "pending"
case sold = "sold"

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ReadOnlyFirst.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ReadOnlyFirst: Codable, JSONEncodable, Hashable {
public struct ReadOnlyFirst: Sendable, Codable, JSONEncodable, Hashable {
public var bar: String?
public var baz: String?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Return.swift
View File

@ -8,7 +8,7 @@
import Foundation
/** Model for testing reserved words */
public struct Return: Codable, JSONEncodable, Hashable {
public struct Return: Sendable, Codable, JSONEncodable, Hashable {
public var _return: Int?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/SpecialModelName.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct SpecialModelName: Codable, JSONEncodable, Hashable {
public struct SpecialModelName: Sendable, Codable, JSONEncodable, Hashable {
public var specialPropertyName: Int64?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Tag: Codable, JSONEncodable, Hashable {
public struct Tag: Sendable, Codable, JSONEncodable, Hashable {
public var id: Int64?
public var name: String?

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderDefault.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct TypeHolderDefault: Codable, JSONEncodable, Hashable {
public struct TypeHolderDefault: Sendable, Codable, JSONEncodable, Hashable {
public var stringItem: String = "what"
public var numberItem: Double

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderExample.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct TypeHolderExample: Codable, JSONEncodable, Hashable {
public struct TypeHolderExample: Sendable, Codable, JSONEncodable, Hashable {
public var stringItem: String
public var numberItem: Double

2
samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct User: Codable, JSONEncodable, Hashable {
public struct User: Sendable, Codable, JSONEncodable, Hashable {
public var id: Int64?
public var username: String?

2
samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONValue.swift
View File

@ -7,7 +7,7 @@
import Foundation
public enum JSONValue: Codable, Hashable {
public enum JSONValue: Sendable, Codable, Hashable {
case string(String)
case int(Int)
case double(Double)

2
samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Models.swift
View File

@ -43,6 +43,8 @@ public enum NullEncodable<Wrapped: Hashable>: Hashable {
case encodeValue(Wrapped)
}
extension NullEncodable: Sendable where Wrapped: Sendable {}
extension NullEncodable: Codable where Wrapped: Codable {
public init(from decoder: Decoder) throws {
let container = try decoder.singleValueContainer()

2
samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift
View File

@ -6,7 +6,7 @@
import Foundation
internal struct SynchronizedDictionary<K: Hashable, V> {
internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
private var dictionary = [K: V]()
private let lock = NSRecursiveLock()

2
samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct AdditionalPropertiesClass: Codable, JSONEncodable, Hashable {
public struct AdditionalPropertiesClass: Sendable, Codable, JSONEncodable, Hashable {
public var mapString: [String: String]?
public var mapMapString: [String: [String: String]]?

2
samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Animal.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Animal: Codable, JSONEncodable, Hashable {
public struct Animal: Sendable, Codable, JSONEncodable, Hashable {
public var className: String
public var color: String? = "red"

2
samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ApiResponse.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ApiResponse: Codable, JSONEncodable, Hashable {
public struct ApiResponse: Sendable, Codable, JSONEncodable, Hashable {
public var code: Int?
public var type: String?

2
samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ArrayOfArrayOfNumberOnly: Codable, JSONEncodable, Hashable {
public struct ArrayOfArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable {
public var arrayArrayNumber: [[Double]]?

2
samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ArrayOfNumberOnly: Codable, JSONEncodable, Hashable {
public struct ArrayOfNumberOnly: Sendable, Codable, JSONEncodable, Hashable {
public var arrayNumber: [Double]?

2
samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayTest.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct ArrayTest: Codable, JSONEncodable, Hashable {
public struct ArrayTest: Sendable, Codable, JSONEncodable, Hashable {
public var arrayOfString: [String]?
public var arrayArrayOfInteger: [[Int64]]?

2
samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Capitalization.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Capitalization: Codable, JSONEncodable, Hashable {
public struct Capitalization: Sendable, Codable, JSONEncodable, Hashable {
public var smallCamel: String?
public var capitalCamel: String?

2
samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Cat.swift
View File

@ -7,7 +7,7 @@
import Foundation
public struct Cat: Codable, JSONEncodable, Hashable {
public struct Cat: Sendable, Codable, JSONEncodable, Hashable {
public var className: String
public var color: String? = "red"

Some files were not shown because too many files have changed in this diff Show More