Fix OpenAPI link in broken Swift4/5 README templates (#6035)

* Fix Swift README templates

* Update Swift4/5 samples

modules/openapi-generator/src/main/resources/swift4/README.mustache

@@ -5,7 +5,7 @@
 {{/appDescriptionWithNewLines}}
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: {{appVersion}}
 - Package version: {{packageVersion}}

modules/openapi-generator/src/main/resources/swift5/README.mustache

@@ -5,7 +5,7 @@
 {{/appDescriptionWithNewLines}}
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: {{appVersion}}
 - Package version: {{packageVersion}}

samples/client/petstore/swift4/default/.openapi-generator/VERSION

@@ -1 +1 @@
-4.3.0-SNAPSHOT
+4.3.1-SNAPSHOT

samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.pbxproj

@@ -299,8 +299,6 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				TargetAttributes = {
-				};
 			};
 			buildConfigurationList = ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */;
 			compatibilityVersion = "Xcode 10.0";

samples/client/petstore/swift4/default/README.md

@@ -3,7 +3,7 @@
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 

samples/client/petstore/swift4/nonPublicApi/.openapi-generator/VERSION

@@ -1 +1 @@
-4.3.0-SNAPSHOT
+4.3.1-SNAPSHOT

samples/client/petstore/swift4/nonPublicApi/PetstoreClient.xcodeproj/project.pbxproj

@@ -299,8 +299,6 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				TargetAttributes = {
-				};
 			};
 			buildConfigurationList = ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */;
 			compatibilityVersion = "Xcode 10.0";

samples/client/petstore/swift4/nonPublicApi/README.md

@@ -3,7 +3,7 @@
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 

samples/client/petstore/swift4/objcCompatible/.openapi-generator/VERSION

@@ -1 +1 @@
-4.3.0-SNAPSHOT
+4.3.1-SNAPSHOT

samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj

@@ -299,8 +299,6 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				TargetAttributes = {
-				};
 			};
 			buildConfigurationList = ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */;
 			compatibilityVersion = "Xcode 10.0";

samples/client/petstore/swift4/objcCompatible/README.md

@@ -3,7 +3,7 @@
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 

samples/client/petstore/swift4/promisekitLibrary/.openapi-generator/VERSION

@@ -1 +1 @@
-4.3.0-SNAPSHOT
+4.3.1-SNAPSHOT

samples/client/petstore/swift4/promisekitLibrary/PetstoreClient.xcodeproj/project.pbxproj

@@ -303,8 +303,6 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				TargetAttributes = {
-				};
 			};
 			buildConfigurationList = ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */;
 			compatibilityVersion = "Xcode 10.0";

samples/client/petstore/swift4/promisekitLibrary/README.md

@@ -3,7 +3,7 @@
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 

samples/client/petstore/swift4/resultLibrary/.openapi-generator/VERSION

@@ -1 +1 @@
-4.3.0-SNAPSHOT
+4.3.1-SNAPSHOT

samples/client/petstore/swift4/resultLibrary/PetstoreClient.xcodeproj/project.pbxproj

@@ -302,8 +302,6 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				TargetAttributes = {
-				};
 			};
 			buildConfigurationList = ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */;
 			compatibilityVersion = "Xcode 10.0";

samples/client/petstore/swift4/resultLibrary/README.md

@@ -3,7 +3,7 @@
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 

samples/client/petstore/swift4/rxswiftLibrary/.openapi-generator/VERSION

@@ -1 +1 @@
-4.3.0-SNAPSHOT
+4.3.1-SNAPSHOT

samples/client/petstore/swift4/rxswiftLibrary/PetstoreClient.xcodeproj/project.pbxproj

@@ -303,8 +303,6 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				TargetAttributes = {
-				};
 			};
 			buildConfigurationList = ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */;
 			compatibilityVersion = "Xcode 10.0";

samples/client/petstore/swift4/rxswiftLibrary/README.md

@@ -3,7 +3,7 @@
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 

samples/client/petstore/swift4/unwrapRequired/.openapi-generator/VERSION

@@ -1 +1 @@
-4.3.0-SNAPSHOT
+4.3.1-SNAPSHOT

samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/project.pbxproj

@@ -299,8 +299,6 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				TargetAttributes = {
-				};
 			};
 			buildConfigurationList = ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */;
 			compatibilityVersion = "Xcode 10.0";

samples/client/petstore/swift4/unwrapRequired/README.md

@@ -3,7 +3,7 @@
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 

samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.xcodeproj/project.pbxproj

@@ -305,14 +305,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				TargetAttributes = {
-				};
 			};
 			buildConfigurationList = ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */;
 			compatibilityVersion = "Xcode 10.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				Base,
 				en,
 			);
 			mainGroup = 5FBA6AE5F64CD737F88B4565;
@@ -568,7 +567,7 @@
 				3B2C02AFB91CB5C82766ED5C /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
+			defaultConfigurationName = "";
 		};
 		ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */ = {
 			isa = XCConfigurationList;

samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:PetstoreClient.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>

samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme

@@ -41,6 +41,10 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+      <CodeCoverageTargets>
+      </CodeCoverageTargets>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -63,6 +67,8 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift

@@ -41,7 +41,7 @@ open class RequestBuilder<T> {
         }
     }
 
-    open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Result<Response<T>, Error>) -> Void) { }
+    open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) { }
 
     public func addHeader(name: String, value: String) -> Self {
         if !value.isEmpty {

samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift

@@ -38,11 +38,11 @@ open class CodableHelper {
         set { self.customJSONEncoder = newValue }
     }
 
-    open class func decode<T>(_ type: T.Type, from data: Data) -> Result<T, Error> where T: Decodable {
+    open class func decode<T>(_ type: T.Type, from data: Data) -> Swift.Result<T, Error> where T: Decodable {
-        return Result { try self.jsonDecoder.decode(type, from: data) }
+        return Swift.Result { try self.jsonDecoder.decode(type, from: data) }
     }
 
-    open class func encode<T>(_ value: T) -> Result<Data, Error> where T: Encodable {
+    open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
-        return Result { try self.jsonEncoder.encode(value) }
+        return Swift.Result { try self.jsonEncoder.encode(value) }
     }
 }

samples/client/petstore/swift5/alamofireLibrary/README.md

@@ -3,7 +3,7 @@
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 

samples/client/petstore/swift5/combineLibrary/PetstoreClient.xcodeproj/project.pbxproj

@@ -265,14 +265,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				TargetAttributes = {
-				};
 			};
 			buildConfigurationList = ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */;
 			compatibilityVersion = "Xcode 10.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				Base,
 				en,
 			);
 			mainGroup = 5FBA6AE5F64CD737F88B4565;
@@ -520,7 +519,7 @@
 				3B2C02AFB91CB5C82766ED5C /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
+			defaultConfigurationName = "";
 		};
 		ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */ = {
 			isa = XCConfigurationList;

samples/client/petstore/swift5/combineLibrary/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:PetstoreClient.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>

samples/client/petstore/swift5/combineLibrary/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme

@@ -41,6 +41,10 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+      <CodeCoverageTargets>
+      </CodeCoverageTargets>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -63,6 +67,8 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift

@@ -43,7 +43,7 @@ open class RequestBuilder<T> {
         }
     }
 
-    open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Result<Response<T>, Error>) -> Void) { }
+    open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) { }
 
     public func addHeader(name: String, value: String) -> Self {
         if !value.isEmpty {

samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift

@@ -38,11 +38,11 @@ open class CodableHelper {
         set { self.customJSONEncoder = newValue }
     }
 
-    open class func decode<T>(_ type: T.Type, from data: Data) -> Result<T, Error> where T: Decodable {
+    open class func decode<T>(_ type: T.Type, from data: Data) -> Swift.Result<T, Error> where T: Decodable {
-        return Result { try self.jsonDecoder.decode(type, from: data) }
+        return Swift.Result { try self.jsonDecoder.decode(type, from: data) }
     }
 
-    open class func encode<T>(_ value: T) -> Result<Data, Error> where T: Encodable {
+    open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
-        return Result { try self.jsonEncoder.encode(value) }
+        return Swift.Result { try self.jsonEncoder.encode(value) }
     }
 }

samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift

@@ -102,7 +102,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return modifiedRequest
     }
 
-    override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Result<Response<T>, Error>) -> Void) {
+    override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
         let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
@@ -180,7 +180,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Result<Response<T>, Error>) -> Void) {
+    fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
             completion(.failure(ErrorResponse.error(-1, data, error)))
@@ -312,7 +312,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 }
 
 open class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
-    override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Result<Response<T>, Error>) -> Void) {
+    override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
             completion(.failure(ErrorResponse.error(-1, data, error)))

samples/client/petstore/swift5/combineLibrary/README.md

@@ -3,7 +3,7 @@
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 

samples/client/petstore/swift5/default/Package.swift

@@ -14,7 +14,7 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -26,6 +26,6 @@ let package = Package(
             name: "PetstoreClient",
             dependencies: [],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )

samples/client/petstore/swift5/default/PetstoreClient.xcodeproj/project.pbxproj

@@ -265,14 +265,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				TargetAttributes = {
-				};
 			};
 			buildConfigurationList = ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */;
 			compatibilityVersion = "Xcode 10.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				Base,
 				en,
 			);
 			mainGroup = 5FBA6AE5F64CD737F88B4565;
@@ -520,7 +519,7 @@
 				3B2C02AFB91CB5C82766ED5C /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
+			defaultConfigurationName = "";
 		};
 		ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */ = {
 			isa = XCConfigurationList;

samples/client/petstore/swift5/default/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:PetstoreClient.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>

samples/client/petstore/swift5/default/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme

@@ -41,6 +41,10 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+      <CodeCoverageTargets>
+      </CodeCoverageTargets>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -63,6 +67,8 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift

@@ -22,7 +22,7 @@ public struct APIHelper {
 
     public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
@@ -46,7 +46,7 @@ public struct APIHelper {
     }
 
     public static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
@@ -54,7 +54,7 @@ public struct APIHelper {
 
     public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 let value = collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
                 result.append(URLQueryItem(name: item.key, value: value))
             } else if let value = item.value {
@@ -68,4 +68,3 @@ public struct APIHelper {
         return destination
     }
 }
-

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift

@@ -25,7 +25,7 @@ open class RequestBuilder<T> {
     /// Optional block to obtain a reference to the request's progress instance when available.
     /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
     /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
     required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift

@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift

@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeAPI {
     /**
 

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift

@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift

@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift

@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift

@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class UserAPI {
     /**
      Create user

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift

@@ -148,7 +148,7 @@ extension KeyedDecodingContainerProtocol {
     }
 
     public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
-        var tmpArray: [T]? = nil
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -177,5 +177,3 @@ extension HTTPURLResponse {
         return Array(200 ..< 300).contains(statusCode)
     }
 }
-
-

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift

@@ -41,7 +41,7 @@ public struct JSONDataEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift

@@ -10,7 +10,7 @@ import Foundation
 open class JSONEncodingHelper {
 
     open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models.swift

@@ -30,7 +30,6 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 open class Response<T> {
     public let statusCode: Int
     public let header: [String: String]

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct AdditionalPropertiesClass: Codable {
 
-
     public var mapString: [String: String]?
     public var mapMapString: [String: [String: String]]?
 

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct Animal: Codable {
 
-
     public var className: String
     public var color: String? = "red"
 

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift

@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct ApiResponse: Codable {
 
-
     public var code: Int?
     public var type: String?
     public var message: String?

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct ArrayOfArrayOfNumberOnly: Codable {
 
-
     public var arrayArrayNumber: [[Double]]?
 
     public init(arrayArrayNumber: [[Double]]?) {

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct ArrayOfNumberOnly: Codable {
 
-
     public var arrayNumber: [Double]?
 
     public init(arrayNumber: [Double]?) {

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct ArrayTest: Codable {
 
-
     public var arrayOfString: [String]?
     public var arrayArrayOfInteger: [[Int64]]?
     public var arrayArrayOfModel: [[ReadOnlyFirst]]?

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct Capitalization: Codable {
 
-
     public var smallCamel: String?
     public var capitalCamel: String?
     public var smallSnake: String?

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct Cat: Codable {
 
-
     public var className: String
     public var color: String? = "red"
     public var declawed: Bool?

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct CatAllOf: Codable {
 
-
     public var declawed: Bool?
 
     public init(declawed: Bool?) {

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Category.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct Category: Codable {
 
-
     public var id: Int64?
     public var name: String = "default-name"
 

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift

@@ -10,7 +10,6 @@ import Foundation
 /** Model for testing model with \"_class\" property */
 public struct ClassModel: Codable {
 
-
     public var _class: String?
 
     public init(_class: String?) {

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Client.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct Client: Codable {
 
-
     public var client: String?
 
     public init(client: String?) {

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct Dog: Codable {
 
-
     public var className: String
     public var color: String? = "red"
     public var breed: String?

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct DogAllOf: Codable {
 
-
     public var breed: String?
 
     public init(breed: String?) {

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct EnumArrays: Codable {
 
-
     public enum JustSymbol: String, Codable, CaseIterable {
         case greaterThanOrEqualTo = ">="
         case dollar = "$"

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable, CaseIterable {
     case abc = "_abc"
     case efg = "-efg"

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct EnumTest: Codable {
 
-
     public enum EnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift

@@ -10,7 +10,6 @@ import Foundation
 /** Must be named `File` for test. */
 public struct File: Codable {
 
-
     /** Test capitalization */
     public var sourceURI: String?
 

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct FileSchemaTestClass: Codable {
 
-
     public var file: File?
     public var files: [File]?
 

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct FormatTest: Codable {
 
-
     public var integer: Int?
     public var int32: Int?
     public var int64: Int64?

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct HasOnlyReadOnly: Codable {
 
-
     public var bar: String?
     public var foo: String?
 

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/List.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct List: Codable {
 
-
     public var _123list: String?
 
     public init(_123list: String?) {

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct MapTest: Codable {
 
-
     public enum MapOfEnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
-
     public var uuid: UUID?
     public var dateTime: Date?
     public var map: [String: Animal]?

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift

@@ -10,7 +10,6 @@ import Foundation
 /** Model for testing model name starting with number */
 public struct Model200Response: Codable {
 
-
     public var name: Int?
     public var _class: String?
 

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Name.swift

@@ -10,7 +10,6 @@ import Foundation
 /** Model for testing model name same as property name */
 public struct Name: Codable {
 
-
     public var name: Int
     public var snakeCase: Int?
     public var property: String?

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct NumberOnly: Codable {
 
-
     public var justNumber: Double?
 
     public init(justNumber: Double?) {

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct Order: Codable {
 
-
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
         case approved = "approved"

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct OuterComposite: Codable {
 
-
     public var myNumber: Double?
     public var myString: String?
     public var myBoolean: Bool?

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct Pet: Codable {
 
-
     public enum Status: String, Codable, CaseIterable {
         case available = "available"
         case pending = "pending"

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct ReadOnlyFirst: Codable {
 
-
     public var bar: String?
     public var baz: String?
 

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Return.swift

@@ -10,7 +10,6 @@ import Foundation
 /** Model for testing reserved words */
 public struct Return: Codable {
 
-
     public var _return: Int?
 
     public init(_return: Int?) {

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct SpecialModelName: Codable {
 
-
     public var specialPropertyName: Int64?
 
     public init(specialPropertyName: Int64?) {

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift

@@ -7,11 +7,8 @@
 
 import Foundation
 
-
 public struct StringBooleanMap: Codable {
 
-
-
     public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
@@ -45,5 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
 }

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct Tag: Codable {
 
-
     public var id: Int64?
     public var name: String?
 

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct TypeHolderDefault: Codable {
 
-
     public var stringItem: String = "what"
     public var numberItem: Double
     public var integerItem: Int

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct TypeHolderExample: Codable {
 
-
     public var stringItem: String
     public var numberItem: Double
     public var integerItem: Int

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/User.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 
-
 public struct User: Codable {
 
-
     public var id: Int64?
     public var username: String?
     public var firstName: String?

samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift

@@ -363,7 +363,7 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
     }
 }
 
-fileprivate class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
+private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
 
     var credential: URLCredential?
 
@@ -409,7 +409,7 @@ public protocol ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest
 }
 
-fileprivate class URLEncoding: ParameterEncoding {
+private class URLEncoding: ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
 
         var urlRequest = urlRequest
@@ -429,7 +429,7 @@ fileprivate class URLEncoding: ParameterEncoding {
     }
 }
 
-fileprivate class FileUploadEncoding: ParameterEncoding {
+private class FileUploadEncoding: ParameterEncoding {
 
     let contentTypeForFormPart: (_ fileURL: URL) -> String?
 

samples/client/petstore/swift5/default/README.md

@@ -3,7 +3,7 @@
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 

samples/client/petstore/swift5/nonPublicApi/PetstoreClient.xcodeproj/project.pbxproj

@@ -265,14 +265,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				TargetAttributes = {
-				};
 			};
 			buildConfigurationList = ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */;
 			compatibilityVersion = "Xcode 10.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				Base,
 				en,
 			);
 			mainGroup = 5FBA6AE5F64CD737F88B4565;
@@ -520,7 +519,7 @@
 				3B2C02AFB91CB5C82766ED5C /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
+			defaultConfigurationName = "";
 		};
 		ECAB17FF35111B5E14DAAC08 /* Build configuration list for PBXProject "PetstoreClient" */ = {
 			isa = XCConfigurationList;

samples/client/petstore/swift5/nonPublicApi/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:PetstoreClient.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>

samples/client/petstore/swift5/nonPublicApi/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme

@@ -41,6 +41,10 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+      <CodeCoverageTargets>
+      </CodeCoverageTargets>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -63,6 +67,8 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift

@@ -43,7 +43,7 @@ internal class RequestBuilder<T> {
         }
     }
 
-    internal func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Result<Response<T>, Error>) -> Void) { }
+    internal func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) { }
 
     internal func addHeader(name: String, value: String) -> Self {
         if !value.isEmpty {

samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift

@@ -38,11 +38,11 @@ internal class CodableHelper {
         set { self.customJSONEncoder = newValue }
     }
 
-    internal class func decode<T>(_ type: T.Type, from data: Data) -> Result<T, Error> where T: Decodable {
+    internal class func decode<T>(_ type: T.Type, from data: Data) -> Swift.Result<T, Error> where T: Decodable {
-        return Result { try self.jsonDecoder.decode(type, from: data) }
+        return Swift.Result { try self.jsonDecoder.decode(type, from: data) }
     }
 
-    internal class func encode<T>(_ value: T) -> Result<Data, Error> where T: Encodable {
+    internal class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
-        return Result { try self.jsonEncoder.encode(value) }
+        return Swift.Result { try self.jsonEncoder.encode(value) }
     }
 }

samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift

@@ -102,7 +102,7 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return modifiedRequest
     }
 
-    override internal func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Result<Response<T>, Error>) -> Void) {
+    override internal func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
         let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
@@ -180,7 +180,7 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Result<Response<T>, Error>) -> Void) {
+    fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
             completion(.failure(ErrorResponse.error(-1, data, error)))
@@ -312,7 +312,7 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 }
 
 internal class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
-    override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Result<Response<T>, Error>) -> Void) {
+    override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
             completion(.failure(ErrorResponse.error(-1, data, error)))