[swift6] Change Response to struct (#20185)

x-sheep · web-flow · commit 55f02e995b0f · 2024-11-26T08:30:50.000Z
diff --git 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<T> {
+{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct Response<T> {
     {{#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
@@ -90,7 +90,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -103,7 +103,7 @@ open class Response<T> {
         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<T> {
         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
@@ -90,7 +90,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -103,7 +103,7 @@ open class Response<T> {
         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<T> {
         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
@@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -102,7 +102,7 @@ open class Response<T> {
         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<T> {
         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
@@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -102,7 +102,7 @@ open class Response<T> {
         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<T> {
         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
@@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -102,7 +102,7 @@ open class Response<T> {
         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<T> {
         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
@@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -102,7 +102,7 @@ open class Response<T> {
         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<T> {
         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
@@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -102,7 +102,7 @@ open class Response<T> {
         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<T> {
         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
@@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -102,7 +102,7 @@ open class Response<T> {
         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<T> {
         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
@@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -102,7 +102,7 @@ open class Response<T> {
         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<T> {
         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
@@ -89,7 +89,7 @@ internal enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-internal class Response<T> {
+internal struct Response<T> {
     internal let statusCode: Int
     internal let header: [String: String]
     internal let body: T
@@ -102,7 +102,7 @@ internal class Response<T> {
         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<T> {
         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
@@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -102,7 +102,7 @@ open class Response<T> {
         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<T> {
         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
@@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -102,7 +102,7 @@ open class Response<T> {
         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<T> {
         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
@@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class Response<T> {
+public struct Response<T> {
     public let statusCode: Int
     public let header: [String: String]
     public let body: T
@@ -102,7 +102,7 @@ open class Response<T> {
         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<T> {
         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()

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ extension NullEncodable: Codable where Wrapped: Codable {`
`90`	`90`	`case generalError(Error)`
`91`	`91`	`}`
`92`	`92`
`93`		`-{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class Response<T> {`
	`93`	`+{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct Response<T> {`
`94`	`94`	`{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let statusCode: Int`
`95`	`95`	`{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let header: [String: String]`
`96`	`96`	`{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let body: T`
`@@ -103,7 +103,7 @@ extension NullEncodable: Codable where Wrapped: Codable {`
`103`	`103`	`self.bodyData = bodyData`
`104`	`104`	`}`
`105`	`105`
`106`		`- {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) {`
	`106`	`+ {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(response: HTTPURLResponse, body: T, bodyData: Data?) {`
`107`	`107`	`let rawHeader = response.allHeaderFields`
`108`	`108`	`var responseHeader = [String: String]()`
`109`	`109`	`for (key, value) in rawHeader {`
`@@ -113,7 +113,8 @@ extension NullEncodable: Codable where Wrapped: Codable {`
`113`	`113`	`}`
`114`	`114`	`self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData)`
`115`	`115`	`}`
`116`		`-}{{#useAlamofire}}`
	`116`	`+}`
	`117`	`+extension Response : Sendable where T : Sendable {}{{#useAlamofire}}`
`117`	`118`
`118`	`119`	`/// Type-erased ResponseSerializer`
`119`	`120`	`///`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public enum DecodableRequestBuilderError: Error {`
`90`	`90`	`case generalError(Error)`
`91`	`91`	`}`
`92`	`92`
`93`		`-open class Response<T> {`
	`93`	`+public struct Response<T> {`
`94`	`94`	`public let statusCode: Int`
`95`	`95`	`public let header: [String: String]`
`96`	`96`	`public let body: T`
`@@ -103,7 +103,7 @@ open class Response<T> {`
`103`	`103`	`self.bodyData = bodyData`
`104`	`104`	`}`
`105`	`105`
`106`		`- public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) {`
	`106`	`+ public init(response: HTTPURLResponse, body: T, bodyData: Data?) {`
`107`	`107`	`let rawHeader = response.allHeaderFields`
`108`	`108`	`var responseHeader = [String: String]()`
`109`	`109`	`for (key, value) in rawHeader {`
`@@ -114,6 +114,7 @@ open class Response<T> {`
`114`	`114`	`self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData)`
`115`	`115`	`}`
`116`	`116`	`}`
	`117`	`+extension Response : Sendable where T : Sendable {}`
`117`	`118`
`118`	`119`	`/// Type-erased ResponseSerializer`
`119`	`120`	`///`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public enum DecodableRequestBuilderError: Error {`
`89`	`89`	`case generalError(Error)`
`90`	`90`	`}`
`91`	`91`
`92`		`-open class Response<T> {`
	`92`	`+public struct Response<T> {`
`93`	`93`	`public let statusCode: Int`
`94`	`94`	`public let header: [String: String]`
`95`	`95`	`public let body: T`
`@@ -102,7 +102,7 @@ open class Response<T> {`
`102`	`102`	`self.bodyData = bodyData`
`103`	`103`	`}`
`104`	`104`
`105`		`- public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) {`
	`105`	`+ public init(response: HTTPURLResponse, body: T, bodyData: Data?) {`
`106`	`106`	`let rawHeader = response.allHeaderFields`
`107`	`107`	`var responseHeader = [String: String]()`
`108`	`108`	`for (key, value) in rawHeader {`
`@@ -113,6 +113,7 @@ open class Response<T> {`
`113`	`113`	`self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData)`
`114`	`114`	`}`
`115`	`115`	`}`
	`116`	`+extension Response : Sendable where T : Sendable {}`
`116`	`117`
`117`	`118`	`public final class RequestTask: @unchecked Sendable {`
`118`	`119`	`private let lock = NSRecursiveLock()`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ internal enum DecodableRequestBuilderError: Error {`
`89`	`89`	`case generalError(Error)`
`90`	`90`	`}`
`91`	`91`
`92`		`-internal class Response<T> {`
	`92`	`+internal struct Response<T> {`
`93`	`93`	`internal let statusCode: Int`
`94`	`94`	`internal let header: [String: String]`
`95`	`95`	`internal let body: T`
`@@ -102,7 +102,7 @@ internal class Response<T> {`
`102`	`102`	`self.bodyData = bodyData`
`103`	`103`	`}`
`104`	`104`
`105`		`- internal convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) {`
	`105`	`+ internal init(response: HTTPURLResponse, body: T, bodyData: Data?) {`
`106`	`106`	`let rawHeader = response.allHeaderFields`
`107`	`107`	`var responseHeader = [String: String]()`
`108`	`108`	`for (key, value) in rawHeader {`
`@@ -113,6 +113,7 @@ internal class Response<T> {`
`113`	`113`	`self.init(statusCode: response.statusCode, header: responseHeader, body: body, bodyData: bodyData)`
`114`	`114`	`}`
`115`	`115`	`}`
	`116`	`+extension Response : Sendable where T : Sendable {}`
`116`	`117`
`117`	`118`	`internal final class RequestTask: @unchecked Sendable {`
`118`	`119`	`private let lock = NSRecursiveLock()`