diff --git a/modules/openapi-generator/src/main/resources/swift6/Models.mustache b/modules/openapi-generator/src/main/resources/swift6/Models.mustache index 3998b58ae0b..48d37fa6247 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Models.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Models.mustache @@ -90,7 +90,7 @@ extension NullEncodable: Codable where Wrapped: Codable { case generalError(Error) } -{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class Response { +{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct Response { {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let statusCode: Int {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let header: [String: String] {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let body: T @@ -103,7 +103,7 @@ extension NullEncodable: Codable where Wrapped: Codable { self.bodyData = bodyData } - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,7 +113,8 @@ extension NullEncodable: Codable where Wrapped: Codable { } self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } -}{{#useAlamofire}} +} +extension Response : Sendable where T : Sendable {}{{#useAlamofire}} /// Type-erased ResponseSerializer /// diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Models.swift index 7381cd80bf9..9f52fd5393e 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Models.swift @@ -90,7 +90,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -103,7 +103,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -114,6 +114,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} /// Type-erased ResponseSerializer /// diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Models.swift index 7381cd80bf9..9f52fd5393e 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Models.swift @@ -90,7 +90,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -103,7 +103,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -114,6 +114,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} /// Type-erased ResponseSerializer /// diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Models.swift index 15a76f8541f..f8e21e4d184 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Models.swift @@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -102,7 +102,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,6 +113,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} public final class RequestTask: @unchecked Sendable { private let lock = NSRecursiveLock() diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index 15a76f8541f..f8e21e4d184 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -102,7 +102,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,6 +113,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} public final class RequestTask: @unchecked Sendable { private let lock = NSRecursiveLock() diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Models.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Models.swift index 15a76f8541f..f8e21e4d184 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Models.swift @@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -102,7 +102,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,6 +113,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} public final class RequestTask: @unchecked Sendable { private let lock = NSRecursiveLock() diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Models.swift index 15a76f8541f..f8e21e4d184 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Models.swift @@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -102,7 +102,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,6 +113,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} public final class RequestTask: @unchecked Sendable { private let lock = NSRecursiveLock() diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Models.swift index 15a76f8541f..f8e21e4d184 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Models.swift @@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -102,7 +102,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,6 +113,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} public final class RequestTask: @unchecked Sendable { private let lock = NSRecursiveLock() diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index 15a76f8541f..f8e21e4d184 100644 --- a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -102,7 +102,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,6 +113,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} public final class RequestTask: @unchecked Sendable { private let lock = NSRecursiveLock() diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index 15a76f8541f..f8e21e4d184 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -102,7 +102,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,6 +113,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} public final class RequestTask: @unchecked Sendable { private let lock = NSRecursiveLock() diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index 6c41b1653e4..d6e95fffc23 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -89,7 +89,7 @@ internal enum DecodableRequestBuilderError: Error { case generalError(Error) } -internal class Response { +internal struct Response { internal let statusCode: Int internal let header: [String: String] internal let body: T @@ -102,7 +102,7 @@ internal class Response { self.bodyData = bodyData } - internal convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + internal init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,6 +113,7 @@ internal class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} internal final class RequestTask: @unchecked Sendable { private let lock = NSRecursiveLock() diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index 15a76f8541f..f8e21e4d184 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -102,7 +102,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,6 +113,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} public final class RequestTask: @unchecked Sendable { private let lock = NSRecursiveLock() diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Models.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Models.swift index 15a76f8541f..f8e21e4d184 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Models.swift @@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -102,7 +102,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,6 +113,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} public final class RequestTask: @unchecked Sendable { private let lock = NSRecursiveLock() diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift index 15a76f8541f..f8e21e4d184 100644 --- a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +++ b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift @@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error { case generalError(Error) } -open class Response { +public struct Response { public let statusCode: Int public let header: [String: String] public let body: T @@ -102,7 +102,7 @@ open class Response { self.bodyData = bodyData } - public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + public init(response: HTTPURLResponse, body: T, bodyData: Data?) { let rawHeader = response.allHeaderFields var responseHeader = [String: String]() for (key, value) in rawHeader { @@ -113,6 +113,7 @@ open class Response { self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData) } } +extension Response : Sendable where T : Sendable {} public final class RequestTask: @unchecked Sendable { private let lock = NSRecursiveLock()