[Swift] shorter readme (#19884)

* [Swift] shorter readme

* [Swift] update docs

* [Swift] update docs

* [Swift] format codegen

* [Swift] try to make CI pass

Author: 4brunu

docs/faq-generators.md

@@ -477,6 +477,8 @@ Here is a working sample that put's together all of this.
 
 ### How do I migrate from the Swift 5 generator to the swift 6 generator?
 
+- Change the generator to the new `swift6` generator, e.g. `openapi-generator generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g swift6 -o /tmp/test/`
+- Check the `swift6` [URLSession](https://github.com/OpenAPITools/openapi-generator/tree/master/samples/client/petstore/swift6/urlsessionLibrary) and [Alamofire](https://github.com/OpenAPITools/openapi-generator/tree/master/samples/client/petstore/swift6/alamofireLibrary) samples.
 - The infrastructure files have been moved to a new directory called `Infrastructure`. Please delete the old ones.
 - The `AnyCodable` dependency has been removed and replaced with a new enum called `JSONValue`, allowing you to use this generator without external dependencies.
 - The `Combine` response is now deferred by default, meaning the request will only start when you begin listening to it. To restore the previous behavior, set the `combineDeferred` flag to `false`.

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java

@@ -366,7 +366,6 @@ private static CodegenModel reconcileProperties(CodegenModel codegenModel,
             codegenModel.vars = codegenProperties;
         }
 
-
         return codegenModel;
     }
 
@@ -847,7 +846,6 @@ public String toOperationId(String operationId) {
             operationId = camelize(sanitizeName("call_" + operationId), LOWERCASE_FIRST_LETTER);
         }
 
-
         return operationId;
     }
 
@@ -1306,9 +1304,11 @@ public void postProcess() {
         System.out.println("# swift5 generator is contributed by Bruno Coelho (https://github.com/4brunu). #");
         System.out.println("# Please support his work directly via https://paypal.com/paypalme/4brunu \uD83D\uDE4F   #");
         System.out.println("#                                                                              #");
-        System.out.println("# There is a new `swift6` generator, that is currently in beta.                #");
+        System.out.println("# There is a new swift6 generator, that is currently in beta.                #");
         System.out.println("# Try it and give us your feedback.                                            #");
         System.out.println("# https://openapi-generator.tech/docs/generators/swift6                        #");
+        System.out.println("#                                                                              #");
+        System.out.println("# If you need help migrating from the swift5 to the swift6 generator, check the following url.#");
         System.out.println("# https://openapi-generator.tech/docs/faq-generators/#how-do-i-migrate-from-the-swift-5-generator-to-the-swift-6-generator");
         System.out.println("################################################################################");
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java

@@ -78,250 +78,20 @@ Class | Method | HTTP request | Description
 
 {{/authMethods}}
 
-{{#useURLSession}}
-### How do I implement bearer token authentication with URLSession on the Swift 5 API client?
-
-First you subclass RequestBuilderFactory
-```
-class BearerRequestBuilderFactory: RequestBuilderFactory {
-    func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type {
-        BearerRequestBuilder<T>.self
-    }
-
-    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
-        BearerDecodableRequestBuilder<T>.self
-    }
-}
-```
-
-Then you subclass URLSessionRequestBuilder and URLSessionDecodableRequestBuilder
-```
-class BearerRequestBuilder<T>: URLSessionRequestBuilder<T> {
-    @discardableResult
-    override func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (Result<Response<T>, ErrorResponse>) -> Void) -> RequestTask {
-
-        // Before making the request, we can validate if we have a bearer token to be able to make a request
-        BearerTokenHandler.refreshTokenIfDoesntExist {
-            
-            // Here we make the request
-            super.execute(apiResponseQueue) { result in
-                
-                switch result {
-                case .success:
-                    // If we got a successful response, we send the response to the completion block
-                    completion(result)
-                    
-                case let .failure(error):
-                    
-                    // If we got a failure response, we will analyse the error to see what we should do with it
-                    if case let ErrorResponse.error(_, data, response, error) = error {
-                        
-                        // If the error is an ErrorResponse.error() we will analyse it to see if it's a 401, and if it's a 401, we will refresh the token and retry the request
-                        BearerTokenHandler.refreshTokenIfUnauthorizedRequestResponse(
-                            data: data,
-                            response: response,
-                            error: error
-                        ) { wasTokenRefreshed in
-                            
-                            if wasTokenRefreshed {
-                                // If the token was refreshed, it's because it was a 401 error, so we refreshed the token, and we are going to retry the request by calling self.execute()
-                                self.execute(apiResponseQueue, completion)
-                            } else {
-                                // If the token was not refreshed, it's because it was not a 401 error, so we send the response to the completion block
-                                completion(result)
-                            }
-                        }
-                    } else {
-                        // If it's an unknown error, we send the response to the completion block
-                        completion(result)
-                    }
-                    
-                }
-            }
-        }
-        
-        return requestTask
-    }
-}
-
-class BearerDecodableRequestBuilder<T: Decodable>: URLSessionDecodableRequestBuilder<T> {
-    @discardableResult
-    override func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (Result<Response<T>, ErrorResponse>) -> Void) -> RequestTask {
-        // Before making the request, we can validate if we have a bearer token to be able to make a request
-        BearerTokenHandler.refreshTokenIfDoesntExist {
-            
-            // Here we make the request
-            super.execute(apiResponseQueue) { result in
-                
-                switch result {
-                case .success:
-                    // If we got a successful response, we send the response to the completion block
-                    completion(result)
-                    
-                case let .failure(error):
-                    
-                    // If we got a failure response, we will analyse the error to see what we should do with it
-                    if case let ErrorResponse.error(_, data, response, error) = error {
-                        
-                        // If the error is an ErrorResponse.error() we will analyse it to see if it's a 401, and if it's a 401, we will refresh the token and retry the request
-                        BearerTokenHandler.refreshTokenIfUnauthorizedRequestResponse(
-                            data: data,
-                            response: response,
-                            error: error
-                        ) { wasTokenRefreshed in
-                            
-                            if wasTokenRefreshed {
-                                // If the token was refreshed, it's because it was a 401 error, so we refreshed the token, and we are going to retry the request by calling self.execute()
-                                self.execute(apiResponseQueue, completion)
-                            } else {
-                                // If the token was not refreshed, it's because it was not a 401 error, so we send the response to the completion block
-                                completion(result)
-                            }
-                        }
-                    } else {
-                        // If it's an unknown error, we send the response to the completion block
-                        completion(result)
-                    }
-                    
-                }
-            }
-        }
-        
-        return requestTask
-    }
-}
-
-class BearerTokenHandler {
-    private static var bearerToken: String? = nil
-    
-    static func refreshTokenIfDoesntExist(completionHandler: @escaping () -> Void) {
-        if bearerToken != nil {
-            completionHandler()
-        } else {
-            startRefreshingToken {
-                completionHandler()
-            }
-        }
-    }
-    
-    static func refreshTokenIfUnauthorizedRequestResponse(data: Data?, response: URLResponse?, error: Error?, completionHandler: @escaping (Bool) -> Void) {
-        if let response = response as? HTTPURLResponse, response.statusCode == 401 {
-            startRefreshingToken {
-                completionHandler(true)
-            }
-        } else {
-            completionHandler(false)
-        }
-    }
-    
-    private static func startRefreshingToken(completionHandler: @escaping () -> Void) {
-        // Get a bearer token
-        let dummyBearerToken = "..."
-        
-        bearerToken = dummyBearerToken
-        PetstoreClientAPI.customHeaders["Authorization"] = "Bearer \(dummyBearerToken)"
-
-        completionHandler()
-    }
-}
-```
-
-Then you assign the `BearerRequestBuilderFactory` to the property `requestBuilderFactory`.
+# How do I migrate from the Swift 5 generator to the swift 6 generator?
 
-`PetstoreClientAPI.requestBuilderFactory = BearerRequestBuilderFactory()`
+https://openapi-generator.tech/docs/faq-generators#how-do-i-migrate-from-the-swift-5-generator-to-the-swift-6-generator
+{{#useURLSession}}
 
-The name `PetstoreClientAPI.requestBuilderFactory` will change depending on your project name.
+### How do I implement bearer token authentication with URLSession on the Swift 5 API client?
 
-Here is a working sample that put's together all of this.
-[AppDelegate.swift](https://github.com/OpenAPITools/openapi-generator/blob/master/samples/client/petstore/swift5/urlsessionLibrary/SwaggerClientTests/SwaggerClient/AppDelegate.swift)
-[BearerDecodableRequestBuilder.swift](https://github.com/OpenAPITools/openapi-generator/blob/master/samples/client/petstore/swift5/urlsessionLibrary/SwaggerClientTests/SwaggerClient/BearerDecodableRequestBuilder.swift)
+https://openapi-generator.tech/docs/faq-generators#how-do-i-implement-bearer-token-authentication-with-urlsession-on-the-swift-5-api-client
 {{/useURLSession}}
 {{#useAlamofire}}
-### How do I implement bearer token authentication with Alamofire on the Swift 5 API client?
-
-First you subclass RequestBuilderFactory
-```
-class BearerRequestBuilderFactory: RequestBuilderFactory {
-    func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type {
-        BearerRequestBuilder<T>.self
-    }
-    
-    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
-        BearerDecodableRequestBuilder<T>.self
-    }
-}
-```
-
-Then you subclass AlamofireRequestBuilder and AlamofireDecodableRequestBuilder
-```
-class BearerRequestBuilder<T>: AlamofireRequestBuilder<T> {
-    override func createSessionManager() -> SessionManager {
-        let sessionManager = super.createSessionManager()
-        
-        let bearerTokenHandler = BearerTokenHandler()
-        sessionManager.adapter = bearerTokenHandler
-        sessionManager.retrier = bearerTokenHandler
-        
-        return sessionManager
-    }
-}
 
-class BearerDecodableRequestBuilder<T: Decodable>: AlamofireDecodableRequestBuilder<T> {
-    override func createSessionManager() -> SessionManager {
-        let sessionManager = super.createSessionManager()
-        
-        let bearerTokenHandler = BearerTokenHandler()
-        sessionManager.adapter = bearerTokenHandler
-        sessionManager.retrier = bearerTokenHandler
-        
-        return sessionManager
-    }
-}
-
-class BearerTokenHandler: RequestAdapter, RequestRetrier {
-    private static var bearerToken: String? = nil
-    
-    func adapt(_ urlRequest: URLRequest) throws -> URLRequest {
-        if let bearerToken = Self.bearerToken {
-            var urlRequest = urlRequest
-            urlRequest.setValue("Bearer \(bearerToken)", forHTTPHeaderField: "Authorization")
-            return urlRequest
-        }
-        
-        return urlRequest
-    }
-    
-    func should(_: SessionManager, retry request: Request, with _: Error, completion: @escaping RequestRetryCompletion) {
-        if let response = request.task?.response as? HTTPURLResponse, response.statusCode == 401 {
-            Self.startRefreshingToken { isTokenRefreshed in
-                completion(isTokenRefreshed, 0.0)
-            }
-        } else {
-            completion(false, 0.0)
-        }
-    }
-    
-    private static func startRefreshingToken(completionHandler: @escaping (Bool) -> Void) {
-        // Get a bearer token
-        let dummyBearerToken = "..."
-        
-        bearerToken = dummyBearerToken
-        PetstoreClientAPI.customHeaders["Authorization"] = "Bearer \(dummyBearerToken)"
-        
-        completionHandler(true)
-    }
-}
-```
-
-Then you assign the `BearerRequestBuilderFactory` to the property `requestBuilderFactory`.
-
-`PetstoreClientAPI.requestBuilderFactory = BearerRequestBuilderFactory()`
-
-The name `PetstoreClientAPI.requestBuilderFactory` will change depending on your project name.
+### How do I implement bearer token authentication with Alamofire on the Swift 5 API client?
 
-Here is a working sample that put's together all of this.
-[AppDelegate.swift](https://github.com/OpenAPITools/openapi-generator/blob/master/samples/client/petstore/swift5/alamofireLibrary/SwaggerClientTests/SwaggerClient/AppDelegate.swift)
-[BearerTokenHandler.swift](https://github.com/OpenAPITools/openapi-generator/blob/master/samples/client/petstore/swift5/alamofireLibrary/SwaggerClientTests/SwaggerClient/BearerDecodableRequestBuilder.swift)
+https://openapi-generator.tech/docs/faq-generators#how-do-i-implement-bearer-token-authentication-with-alamofire-on-the-swift-5-api-client
 {{/useAlamofire}}
 
 ## Author