[Swift][client] add identifier to each request (#20890)

4brunu · web-flow · commit 4c1257a2b6ff · 2025-03-17T21:05:21.000Z
* [Swift][client] add identifier to each request

* [Swift][client] add identifier to each request

* [Swift][client] CI first build the projects then run the unit tests
diff --git a/modules/openapi-generator/src/main/resources/swift6/APIs.mustache b/modules/openapi-generator/src/main/resources/swift6/APIs.mustache
@@ -82,7 +82,7 @@ import Alamofire{{/useAlamofire}}
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static let shared = {{projectName}}APIConfiguration()
 }{{^useVapor}}
 
-{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class RequestBuilder<T>: @unchecked Sendable {
+{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var credential: URLCredential?
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var headers: [String: String]
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -61,7 +61,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -61,7 +61,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -47,7 +47,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
@@ -47,7 +47,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIs.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIs.swift
@@ -47,7 +47,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -47,7 +47,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -47,7 +47,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
@@ -47,7 +47,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
@@ -47,7 +47,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
@@ -47,7 +47,7 @@ internal class PetstoreClientAPIConfiguration: @unchecked Sendable {
     internal static let shared = PetstoreClientAPIConfiguration()
 }
 
-internal class RequestBuilder<T>: @unchecked Sendable {
+internal class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     internal var credential: URLCredential?
     internal var headers: [String: String]
     internal let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
@@ -47,7 +47,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/swift6_test_all.sh b/samples/client/petstore/swift6/swift6_test_all.sh
@@ -3,17 +3,6 @@ set -e
 
 DIRECTORY=`dirname $0`
 
-# example project with unit tests
-(cd $DIRECTORY/alamofireLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
-(cd $DIRECTORY/apiNonStaticMethod/SwaggerClientTests/ && ./run_xcodebuild.sh)
-(cd $DIRECTORY/asyncAwaitLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
-# (cd $DIRECTORY/combineLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
-(cd $DIRECTORY/combineDeferredLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
-(cd $DIRECTORY/default/SwaggerClientTests/ && ./run_xcodebuild.sh)
-# (cd $DIRECTORY/promisekitLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
-(cd $DIRECTORY/rxswiftLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
-(cd $DIRECTORY/urlsessionLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
-
 # spm build
 (cd $DIRECTORY/alamofireLibrary/ && ./run_spmbuild.sh)
 (cd $DIRECTORY/apiNonStaticMethod/ && ./run_spmbuild.sh)
@@ -23,10 +12,20 @@ DIRECTORY=`dirname $0`
 (cd $DIRECTORY/default/ && ./run_spmbuild.sh)
 (cd $DIRECTORY/objcCompatible/ && ./run_spmbuild.sh)
 (cd $DIRECTORY/oneOf/ && ./run_spmbuild.sh)
-# (cd $DIRECTORY/promisekitLibrary/ && ./run_spmbuild.sh)
+# (cd $DIRECTORY/promisekitLibrary/ && ./run_spmbuild.sh) # Commented to save time in CI, building Swift5 and Swift6 is taking too much time, and making CI fail
 (cd $DIRECTORY/resultLibrary/ && ./run_spmbuild.sh)
 (cd $DIRECTORY/rxswiftLibrary/ && ./run_spmbuild.sh)
 (cd $DIRECTORY/urlsessionLibrary/ && ./run_spmbuild.sh)
 (cd $DIRECTORY/validation/ && ./run_spmbuild.sh)
-# #(cd $DIRECTORY/vaporLibrary/ && ./run_spmbuild.sh)
+# (cd $DIRECTORY/vaporLibrary/ && ./run_spmbuild.sh) # Commented because it's not working
 
+# example project with unit tests
+(cd $DIRECTORY/alamofireLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
+(cd $DIRECTORY/apiNonStaticMethod/SwaggerClientTests/ && ./run_xcodebuild.sh)
+(cd $DIRECTORY/asyncAwaitLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
+# (cd $DIRECTORY/combineLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) # Commented to save time in CI, building Swift5 and Swift6 is taking too much time, and making CI fail
+(cd $DIRECTORY/combineDeferredLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
+(cd $DIRECTORY/default/SwaggerClientTests/ && ./run_xcodebuild.sh)
+# (cd $DIRECTORY/promisekitLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) # Commented to save time in CI, building Swift5 and Swift6 is taking too much time, and making CI fail
+(cd $DIRECTORY/rxswiftLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
+(cd $DIRECTORY/urlsessionLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh)
diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -49,7 +49,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?
diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
@@ -47,7 +47,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {
     public static let shared = PetstoreClientAPIConfiguration()
 }
 
-open class RequestBuilder<T>: @unchecked Sendable {
+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {
     public var credential: URLCredential?
     public var headers: [String: String]
     public let parameters: [String: any Sendable]?

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {`
`61`	`61`	`public static let shared = PetstoreClientAPIConfiguration()`
`62`	`62`	`}`
`63`	`63`
`64`		`-open class RequestBuilder<T>: @unchecked Sendable {`
	`64`	`+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {`
`65`	`65`	`public var credential: URLCredential?`
`66`	`66`	`public var headers: [String: String]`
`67`	`67`	`public let parameters: [String: any Sendable]?`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ open class PetstoreClientAPIConfiguration: @unchecked Sendable {`
`47`	`47`	`public static let shared = PetstoreClientAPIConfiguration()`
`48`	`48`	`}`
`49`	`49`
`50`		`-open class RequestBuilder<T>: @unchecked Sendable {`
	`50`	`+open class RequestBuilder<T>: @unchecked Sendable, Identifiable {`
`51`	`51`	`public var credential: URLCredential?`
`52`	`52`	`public var headers: [String: String]`
`53`	`53`	`public let parameters: [String: any Sendable]?`