[swift6] add credentials by default (#19885)

4brunu · web-flow · commit 38dac13c261d · 2024-10-16T13:38:49.000+01:00
diff --git a/modules/openapi-generator/src/main/resources/swift6/APIs.mustache b/modules/openapi-generator/src/main/resources/swift6/APIs.mustache
@@ -104,6 +104,7 @@ import Alamofire{{/useAlamofire}}
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addHeaders(_ aHeaders: [String: String]) {
@@ -161,9 +162,8 @@ import Alamofire{{/useAlamofire}}
         return self
     }
 
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addCredential() -> Self {
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -83,6 +83,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -103,9 +104,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -83,6 +83,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -138,9 +139,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -124,9 +125,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
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
@@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIs.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIs.swift
@@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -124,9 +125,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
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
@@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
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
@@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
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
@@ -69,6 +69,7 @@ internal class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     internal func addHeaders(_ aHeaders: [String: String]) {
@@ -89,9 +90,8 @@ internal class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    internal func addCredential() -> Self {
+    internal func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
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
@@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift
@@ -71,6 +71,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -91,9 +92,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 
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
@@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
         self.openAPIClient = openAPIClient
 
         addHeaders(openAPIClient.customHeaders)
+        addCredential()
     }
 
     open func addHeaders(_ aHeaders: [String: String]) {
@@ -124,9 +125,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
         return self
     }
 
-    open func addCredential() -> Self {
+    open func addCredential() {
         credential = openAPIClient.credential
-        return self
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ import Alamofire{{/useAlamofire}}`
`104`	`104`	`self.openAPIClient = openAPIClient`
`105`	`105`
`106`	`106`	`addHeaders(openAPIClient.customHeaders)`
	`107`	`+ addCredential()`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addHeaders(_ aHeaders: [String: String]) {`
`@@ -161,9 +162,8 @@ import Alamofire{{/useAlamofire}}`
`161`	`162`	`return self`
`162`	`163`	`}`
`163`	`164`
`164`		`- {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addCredential() -> Self {`
	`165`	`+ {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addCredential() {`
`165`	`166`	`credential = openAPIClient.credential`
`166`		`- return self`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ open class RequestBuilder<T>: @unchecked Sendable {`
`83`	`83`	`self.openAPIClient = openAPIClient`
`84`	`84`
`85`	`85`	`addHeaders(openAPIClient.customHeaders)`
	`86`	`+ addCredential()`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`open func addHeaders(_ aHeaders: [String: String]) {`
`@@ -103,9 +104,8 @@ open class RequestBuilder<T>: @unchecked Sendable {`
`103`	`104`	`return self`
`104`	`105`	`}`
`105`	`106`
`106`		`- open func addCredential() -> Self {`
	`107`	`+ open func addCredential() {`
`107`	`108`	`credential = openAPIClient.credential`
`108`		`- return self`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {`
`69`	`69`	`self.openAPIClient = openAPIClient`
`70`	`70`
`71`	`71`	`addHeaders(openAPIClient.customHeaders)`
	`72`	`+ addCredential()`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`open func addHeaders(_ aHeaders: [String: String]) {`
`@@ -124,9 +125,8 @@ open class RequestBuilder<T>: @unchecked Sendable {`
`124`	`125`	`return self`
`125`	`126`	`}`
`126`	`127`
`127`		`- open func addCredential() -> Self {`
	`128`	`+ open func addCredential() {`
`128`	`129`	`credential = openAPIClient.credential`
`129`		`- return self`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`