diff --git a/modules/openapi-generator/src/main/resources/swift5/APIs.mustache b/modules/openapi-generator/src/main/resources/swift5/APIs.mustache index 76d1a9fae246..65522f8c83c7 100644 --- a/modules/openapi-generator/src/main/resources/swift5/APIs.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/APIs.mustache @@ -37,15 +37,13 @@ import Vapor /// Optional block to obtain a reference to the request's progress instance when available. {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var onProgressReady: ((Progress) -> Void)? - required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders({{projectName}}API.customHeaders) - addCredential() + self.credential = credential } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addHeaders(_ aHeaders: [String: String]) { @@ -93,8 +91,8 @@ import Vapor return self } - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addCredential() { - credential = {{projectName}}API.credential + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/modules/openapi-generator/src/main/resources/swift5/api.mustache b/modules/openapi-generator/src/main/resources/swift5/api.mustache index f39aaddb2b4e..eb7d1ab4eb01 100644 --- a/modules/openapi-generator/src/main/resources/swift5/api.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/api.mustache @@ -5,7 +5,10 @@ // https://openapi-generator.tech // -import Foundation{{#usePromiseKit}} +import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif{{#usePromiseKit}} import PromiseKit{{/usePromiseKit}}{{#useRxSwift}} import RxSwift{{/useRxSwift}}{{#useCombine}} #if canImport(Combine) @@ -22,6 +25,22 @@ extension {{projectName}}API { {{#description}} /** {{{.}}} */{{/description}} {{#objcCompatible}}@objcMembers {{/objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class {{classname}}{{#objcCompatible}} : NSObject{{/objcCompatible}} { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init( + basePath: String = {{projectName}}API.basePath, + customHeaders: [String: String] = {{projectName}}API.customHeaders, + credential: URLCredential? = {{projectName}}API.credential, + requestBuilderFactory: RequestBuilderFactory = {{projectName}}API.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } {{#operation}} {{#allParams}} {{#isEnum}} @@ -68,7 +87,7 @@ extension {{projectName}}API { @available(*, deprecated, message: "This operation is deprecated.") {{/isDeprecated}} @discardableResult - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}apiResponseQueue: DispatchQueue = {{projectName}}API.apiResponseQueue, completion: @escaping ((_ data: {{{returnType}}}{{^returnType}}Void{{/returnType}}?, _ error: Error?) -> Void)) -> RequestTask { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}apiResponseQueue: DispatchQueue = {{projectName}}API.apiResponseQueue, completion: @escaping ((_ data: {{{returnType}}}{{^returnType}}Void{{/returnType}}?, _ error: Error?) -> Void)) -> RequestTask { return {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).execute(apiResponseQueue) { result in switch result { {{#returnType}} @@ -102,7 +121,7 @@ extension {{projectName}}API { {{#isDeprecated}} @available(*, deprecated, message: "This operation is deprecated.") {{/isDeprecated}} - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}} {{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> Promise<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}> { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}({{#allParams}} {{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> Promise<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}> { let deferred = Promise<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.pending() {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).execute { result in switch result { @@ -134,9 +153,11 @@ extension {{projectName}}API { {{#isDeprecated}} @available(*, deprecated, message: "This operation is deprecated.") {{/isDeprecated}} - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}apiResponseQueue: DispatchQueue = {{projectName}}API.apiResponseQueue) -> Observable<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}> { - return Observable.create { observer -> Disposable in - let requestTask = {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).execute(apiResponseQueue) { result in + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}apiResponseQueue: DispatchQueue = {{projectName}}API.apiResponseQueue) -> Observable<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}> { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).execute(apiResponseQueue) { result in switch result { {{#returnType}} case let .success(response): @@ -150,10 +171,13 @@ extension {{projectName}}API { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -172,7 +196,7 @@ extension {{projectName}}API { @available(*, deprecated, message: "This operation is deprecated.") {{/isDeprecated}} @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> AnyPublisher<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error> { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> AnyPublisher<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error> { let requestBuilder = {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) let requestTask = requestBuilder.requestTask return Future<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error> { promise in @@ -211,7 +235,7 @@ extension {{projectName}}API { @available(*, deprecated, message: "This operation is deprecated.") {{/isDeprecated}} @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) async throws{{#returnType}} -> {{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{/returnType}} { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) async throws{{#returnType}} -> {{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{/returnType}} { return try await {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).execute().body } {{/useAsyncAwait}} @@ -229,7 +253,7 @@ extension {{projectName}}API { @available(*, deprecated, message: "This operation is deprecated.") {{/isDeprecated}} @discardableResult - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}apiResponseQueue: DispatchQueue = {{projectName}}API.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}, ErrorResponse>) -> Void)) -> RequestTask { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}apiResponseQueue: DispatchQueue = {{projectName}}API.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}, ErrorResponse>) -> Void)) -> RequestTask { return {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).execute(apiResponseQueue) { result in switch result { {{#returnType}} @@ -275,12 +299,12 @@ extension {{projectName}}API { {{#isDeprecated}} @available(*, deprecated, message: "This operation is deprecated.") {{/isDeprecated}} - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}Raw({{#allParams}}{{paramName}}: {{#isEnum}}{{#isArray}}[{{enumName}}_{{operationId}}]{{/isArray}}{{^isArray}}{{#isContainer}}{{{dataType}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}_{{operationId}}{{/isContainer}}{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}headers: HTTPHeaders = {{projectName}}API.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}Raw({{#allParams}}{{paramName}}: {{#isEnum}}{{#isArray}}[{{enumName}}_{{operationId}}]{{/isArray}}{{^isArray}}{{#isContainer}}{{{dataType}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}_{{operationId}}{{/isContainer}}{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { {{^pathParams}}let{{/pathParams}}{{#pathParams}}{{#-first}}var{{/-first}}{{/pathParams}} localVariablePath = "{{{path}}}"{{#pathParams}} let {{paramName}}PreEscape = String(describing: {{#isEnum}}{{paramName}}{{#isContainer}}{{{dataType}}}{{/isContainer}}{{^isContainer}}.rawValue{{/isContainer}}{{/isEnum}}{{^isEnum}}{{paramName}}{{/isEnum}}) let {{paramName}}PostEscape = {{paramName}}PreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{{=<% %>=}}{<%baseName%>}<%={{ }}=%>", with: {{paramName}}PostEscape, options: .literal, range: nil){{/pathParams}} - let localVariableURLString = {{projectName}}API.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = {{#swiftUseApiNamespace}}{{projectName}}API.{{/swiftUseApiNamespace}}Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -355,7 +379,7 @@ extension {{projectName}}API { {{#isDeprecated}} @available(*, deprecated, message: "This operation is deprecated.") {{/isDeprecated}} - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isArray}}[{{enumName}}_{{operationId}}]{{/isArray}}{{^isArray}}{{#isContainer}}{{{dataType}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}_{{operationId}}{{/isContainer}}{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}headers: HTTPHeaders = {{projectName}}API.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture<{{#lambda.titlecase}}{{operationId}}{{/lambda.titlecase}}> { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isArray}}[{{enumName}}_{{operationId}}]{{/isArray}}{{^isArray}}{{#isContainer}}{{{dataType}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}_{{operationId}}{{/isContainer}}{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture<{{#lambda.titlecase}}{{operationId}}{{/lambda.titlecase}}> { return {{operationId}}Raw({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> {{#lambda.titlecase}}{{operationId}}{{/lambda.titlecase}} in switch response.status.code { {{#responses}} @@ -399,12 +423,12 @@ extension {{projectName}}API { {{#isDeprecated}} @available(*, deprecated, message: "This operation is deprecated.") {{/isDeprecated}} - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> RequestBuilder<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}> { + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> RequestBuilder<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}> { {{^pathParams}}let{{/pathParams}}{{#pathParams}}{{#-first}}var{{/-first}}{{/pathParams}} localVariablePath = "{{{path}}}"{{#pathParams}} let {{paramName}}PreEscape = "\({{#isEnum}}{{paramName}}{{#isContainer}}{{{dataType}}}{{/isContainer}}{{^isContainer}}.rawValue{{/isContainer}}{{/isEnum}}{{^isEnum}}APIHelper.mapValueToPathItem({{paramName}}){{/isEnum}})" let {{paramName}}PostEscape = {{paramName}}PreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{{=<% %>=}}{<%baseName%>}<%={{ }}=%>", with: {{paramName}}PostEscape, options: .literal, range: nil){{/pathParams}} - let localVariableURLString = {{projectName}}API.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath {{#bodyParam}} {{#isBinary}} let localVariableParameters = ["body": {{paramName}}] @@ -443,11 +467,14 @@ extension {{projectName}}API { {{> _param}},{{/headerParams}} ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}API.requestBuilderFactory.{{#returnType}}getBuilder(){{/returnType}}{{^returnType}}getNonDecodableBuilder(){{/returnType}} + let localVariableRequestBuilder: RequestBuilder<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.Type = requestBuilderFactory.{{#returnType}}getBuilder(){{/returnType}}{{^returnType}}getNonDecodableBuilder(){{/returnType}} - return localVariableRequestBuilder.init(method: "{{httpMethod}}", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: {{#hasAuthMethods}}true{{/hasAuthMethods}}{{^hasAuthMethods}}false{{/hasAuthMethods}}) + return localVariableRequestBuilder.init(method: "{{httpMethod}}", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: {{#hasAuthMethods}}true{{/hasAuthMethods}}{{^hasAuthMethods}}false{{/hasAuthMethods}}, credential: credential) } {{/useVapor}} {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/swift5/api_doc.mustache b/modules/openapi-generator/src/main/resources/swift5/api_doc.mustache index 7faccc1a1d8f..7b86e97c5c5e 100644 --- a/modules/openapi-generator/src/main/resources/swift5/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/api_doc.mustache @@ -15,18 +15,18 @@ Method | HTTP request | Description {{^usePromiseKit}} {{^useRxSwift}} {{^useVapor}} - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}completion: @escaping (_ data: {{{returnType}}}{{^returnType}}Void{{/returnType}}?, _ error: Error?) -> Void) + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}completion: @escaping (_ data: {{{returnType}}}{{^returnType}}Void{{/returnType}}?, _ error: Error?) -> Void) {{/useVapor}} {{/useRxSwift}} {{/usePromiseKit}} {{#usePromiseKit}} - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}} {{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> Promise<{{{returnType}}}{{^returnType}}Void{{/returnType}}> + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}({{#allParams}} {{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> Promise<{{{returnType}}}{{^returnType}}Void{{/returnType}}> {{/usePromiseKit}} {{#useRxSwift}} - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> Observable<{{{returnType}}}{{^returnType}}Void{{/returnType}}> + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) -> Observable<{{{returnType}}}{{^returnType}}Void{{/returnType}}> {{/useRxSwift}} {{#useVapor}} - {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}headers: HTTPHeaders = {{projectName}}API.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture<{{#lambda.titlecase}}{{operationId}}{{/lambda.titlecase}}> + {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#hasParams}}, {{/hasParams}}headers: HTTPHeaders = {{projectName}}API.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture<{{#lambda.titlecase}}{{operationId}}{{/lambda.titlecase}}> {{/useVapor}} ``` @@ -48,7 +48,7 @@ import {{{projectName}}} {{#summary}} // {{{.}}} {{/summary}} -{{classname}}.{{{operationId}}}({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) { (response, error) in +{{classname}}().{{{operationId}}}({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) { (response, error) in guard error == nil else { print(error) return @@ -65,7 +65,7 @@ import {{{projectName}}} {{#summary}} // {{{.}}} {{/summary}} -{{classname}}.{{{operationId}}}({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).then { +{{classname}}().{{{operationId}}}({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -80,7 +80,7 @@ import {{{projectName}}} {{#summary}} // {{{.}}} {{/summary}} -{{classname}}.{{{operationId}}}({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).whenComplete { result in +{{classname}}().{{{operationId}}}({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).whenComplete { result in switch result { case .failure(let error): // process error diff --git a/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache b/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache index ff7c5f3c38ab..1302290b7771 100644 --- a/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache @@ -21,8 +21,8 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory { private var managerStore = SynchronizedDictionary() {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class AlamofireRequestBuilder: RequestBuilder { - required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache b/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache index b045c18c66b5..ce23c33c82e2 100644 --- a/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache @@ -71,8 +71,8 @@ private var credentialStore = SynchronizedDictionary() */ {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var taskDidReceiveChallenge: {{projectName}}APIChallengeHandler? - required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 81948617ef67..454475ee17c6 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -28,15 +28,13 @@ open class RequestBuilder { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders(PetstoreClientAPI.customHeaders) - addCredential() + self.credential = credential } open func addHeaders(_ aHeaders: [String: String]) { @@ -57,8 +55,8 @@ open class RequestBuilder { return self } - open func addCredential() { - credential = PetstoreClientAPI.credential + open func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index 7c06bb2f6d1b..f95da699a554 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class AnotherFakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test special tags @@ -20,7 +39,7 @@ open class AnotherFakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -38,9 +57,9 @@ open class AnotherFakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { + open func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/another-fake/dummy" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -49,10 +68,13 @@ open class AnotherFakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index 9e246a77ebea..f23780b940ea 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class FakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** @@ -19,7 +38,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -36,9 +55,9 @@ open class FakeAPI { - parameter body: (body) Input boolean as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { + open func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/boolean" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -47,11 +66,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -61,7 +83,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -78,9 +100,9 @@ open class FakeAPI { - parameter body: (body) Input composite as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { + open func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/composite" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -89,11 +111,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -103,7 +128,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -120,9 +145,9 @@ open class FakeAPI { - parameter body: (body) Input number as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { + open func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/number" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -131,11 +156,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -145,7 +173,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -162,9 +190,9 @@ open class FakeAPI { - parameter body: (body) Input string as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { + open func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/string" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -173,11 +201,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -187,7 +218,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -204,9 +235,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { + open func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { let localVariablePath = "/fake/body-with-file-schema" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -215,11 +246,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -230,7 +264,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -247,9 +281,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { + open func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { let localVariablePath = "/fake/body-with-query-params" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -261,11 +295,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -276,7 +313,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -294,9 +331,9 @@ open class FakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -305,11 +342,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -333,7 +373,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: OpenAPIDateWithoutTime? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: OpenAPIDateWithoutTime? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result in switch result { case .success: @@ -367,9 +407,9 @@ open class FakeAPI { - parameter callback: (form) None (optional) - returns: RequestBuilder */ - open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: OpenAPIDateWithoutTime? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { + open func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: OpenAPIDateWithoutTime? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "integer": integer?.encodeToJSON(), "int32": int32?.encodeToJSON(), @@ -396,11 +436,14 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -485,7 +528,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result in switch result { case .success: @@ -510,9 +553,9 @@ open class FakeAPI { - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: RequestBuilder */ - open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { + open func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "enum_form_string_array": enumFormStringArray?.encodeToJSON(), "enum_form_string": enumFormString?.encodeToJSON(), @@ -535,11 +578,14 @@ open class FakeAPI { "enum_header_string": enumHeaderString?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -555,7 +601,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result in switch result { case .success: @@ -578,9 +624,9 @@ open class FakeAPI { - parameter int64Group: (query) Integer in group parameters (optional) - returns: RequestBuilder */ - open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { + open func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -596,11 +642,14 @@ open class FakeAPI { "boolean_group": booleanGroup?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -611,7 +660,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result in switch result { case .success: @@ -628,9 +677,9 @@ open class FakeAPI { - parameter param: (body) request body - returns: RequestBuilder */ - open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { + open func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { let localVariablePath = "/fake/inline-additionalProperties" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -639,11 +688,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -655,7 +707,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result in switch result { case .success: @@ -673,9 +725,9 @@ open class FakeAPI { - parameter param2: (form) field2 - returns: RequestBuilder */ - open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { + open func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "param": param.encodeToJSON(), "param2": param2.encodeToJSON(), @@ -690,10 +742,13 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index d70cffdbdde7..45a52bd3da68 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class FakeClassnameTags123API { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test class name in snake case @@ -20,7 +39,7 @@ open class FakeClassnameTags123API { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -41,9 +60,9 @@ open class FakeClassnameTags123API { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake_classname_test" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -52,10 +71,13 @@ open class FakeClassnameTags123API { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index 747cb1406a87..ed7c414f2f07 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class PetAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Add a new pet to the store @@ -20,7 +39,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -43,9 +62,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -54,11 +73,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -70,7 +92,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result in switch result { case .success: @@ -91,12 +113,12 @@ open class PetAPI { - parameter apiKey: (header) (optional) - returns: RequestBuilder */ - open class func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { + open func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -105,11 +127,14 @@ open class PetAPI { "api_key": apiKey?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -129,7 +154,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { + open func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { return findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -150,9 +175,9 @@ open class PetAPI { - parameter status: (query) Status values that need to be considered for filter - returns: RequestBuilder<[Pet]> */ - open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { + open func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -164,11 +189,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -180,7 +208,7 @@ open class PetAPI { */ @available(*, deprecated, message: "This operation is deprecated.") @discardableResult - open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { + open func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { return findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -202,9 +230,9 @@ open class PetAPI { - returns: RequestBuilder<[Pet]> */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { + open func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -216,11 +244,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -231,7 +262,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) -> RequestTask { + open func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) -> RequestTask { return getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -252,12 +283,12 @@ open class PetAPI { - parameter petId: (path) ID of pet to return - returns: RequestBuilder */ - open class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { + open func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -266,11 +297,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -281,7 +315,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -301,9 +335,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -312,11 +346,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -329,7 +366,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result in switch result { case .success: @@ -351,12 +388,12 @@ open class PetAPI { - parameter status: (form) Updated status of the pet (optional) - returns: RequestBuilder */ - open class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { + open func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "name": name?.encodeToJSON(), "status": status?.encodeToJSON(), @@ -371,11 +408,14 @@ open class PetAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -388,7 +428,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { return uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -410,12 +450,12 @@ open class PetAPI { - parameter file: (form) file to upload (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { + open func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}/uploadImage" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "file": file?.encodeToJSON(), @@ -430,11 +470,14 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -447,7 +490,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { return uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -469,12 +512,12 @@ open class PetAPI { - parameter additionalMetadata: (form) Additional data to pass to server (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { + open func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { var localVariablePath = "/fake/{petId}/uploadImageWithRequiredFile" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "requiredFile": requiredFile.encodeToJSON(), @@ -489,10 +532,13 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index ad60d97fa921..4712a26fb5d6 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class StoreAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Delete purchase order by ID @@ -20,7 +39,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case .success: @@ -38,12 +57,12 @@ open class StoreAPI { - parameter orderId: (path) ID of the order that needs to be deleted - returns: RequestBuilder */ - open class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { + open func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -52,11 +71,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -66,7 +88,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) -> RequestTask { + open func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) -> RequestTask { return getInventoryWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -86,9 +108,9 @@ open class StoreAPI { - name: api_key - returns: RequestBuilder<[String: Int]> */ - open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { + open func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -97,11 +119,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -112,7 +137,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { + open func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { return getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -130,12 +155,12 @@ open class StoreAPI { - parameter orderId: (path) ID of pet that needs to be fetched - returns: RequestBuilder */ - open class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { + open func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -144,11 +169,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -159,7 +187,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { + open func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { return placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -176,9 +204,9 @@ open class StoreAPI { - parameter body: (body) order placed for purchasing the pet - returns: RequestBuilder */ - open class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { + open func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { let localVariablePath = "/store/order" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -187,10 +215,13 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index 5072c1f1daea..937539aa1e9b 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class UserAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Create user @@ -20,7 +39,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -38,9 +57,9 @@ open class UserAPI { - parameter body: (body) Created user object - returns: RequestBuilder */ - open class func createUserWithRequestBuilder(body: User) -> RequestBuilder { + open func createUserWithRequestBuilder(body: User) -> RequestBuilder { let localVariablePath = "/user" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -49,11 +68,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -64,7 +86,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -81,9 +103,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithArray" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -92,11 +114,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -107,7 +132,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -124,9 +149,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithList" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -135,11 +160,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -150,7 +178,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case .success: @@ -168,12 +196,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be deleted - returns: RequestBuilder */ - open class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { + open func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -182,11 +210,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -197,7 +228,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) -> RequestTask { + open func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) -> RequestTask { return getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -214,12 +245,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: RequestBuilder */ - open class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { + open func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -228,11 +259,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -244,7 +278,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { + open func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { return loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -263,9 +297,9 @@ open class UserAPI { - parameter password: (query) The password for login in clear text - returns: RequestBuilder */ - open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { + open func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { let localVariablePath = "/user/login" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -278,11 +312,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -292,7 +329,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return logoutUserWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case .success: @@ -308,9 +345,9 @@ open class UserAPI { - GET /user/logout - returns: RequestBuilder */ - open class func logoutUserWithRequestBuilder() -> RequestBuilder { + open func logoutUserWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/user/logout" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -319,11 +356,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -335,7 +375,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -354,12 +394,12 @@ open class UserAPI { - parameter body: (body) Updated user object - returns: RequestBuilder */ - open class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { + open func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -368,10 +408,13 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift index 4ef3e913c978..1ac7cb31fd18 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift @@ -21,8 +21,8 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory { private var managerStore = SynchronizedDictionary() open class AlamofireRequestBuilder: RequestBuilder { - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/alamofireLibrary/docs/AnotherFakeAPI.md b/samples/client/petstore/swift5/alamofireLibrary/docs/AnotherFakeAPI.md index 26346e81a4cb..47c30277fb98 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/docs/AnotherFakeAPI.md +++ b/samples/client/petstore/swift5/alamofireLibrary/docs/AnotherFakeAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **call123testSpecialTags** ```swift - open class func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test special tags @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test special tags -AnotherFakeAPI.call123testSpecialTags(body: body) { (response, error) in +AnotherFakeAPI().call123testSpecialTags(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/alamofireLibrary/docs/FakeAPI.md b/samples/client/petstore/swift5/alamofireLibrary/docs/FakeAPI.md index 1d64d2d2c4cd..6e4520fab2dd 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/docs/FakeAPI.md +++ b/samples/client/petstore/swift5/alamofireLibrary/docs/FakeAPI.md @@ -20,7 +20,7 @@ Method | HTTP request | Description # **fakeOuterBooleanSerialize** ```swift - open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) + open func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) ``` @@ -34,7 +34,7 @@ import PetstoreClient let body = true // Bool | Input boolean as post body (optional) -FakeAPI.fakeOuterBooleanSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterBooleanSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -69,7 +69,7 @@ No authorization required # **fakeOuterCompositeSerialize** ```swift - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) ``` @@ -83,7 +83,7 @@ import PetstoreClient let body = OuterComposite(myNumber: 123, myString: "myString_example", myBoolean: false) // OuterComposite | Input composite as post body (optional) -FakeAPI.fakeOuterCompositeSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterCompositeSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -118,7 +118,7 @@ No authorization required # **fakeOuterNumberSerialize** ```swift - open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) + open func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) ``` @@ -132,7 +132,7 @@ import PetstoreClient let body = 987 // Double | Input number as post body (optional) -FakeAPI.fakeOuterNumberSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterNumberSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -167,7 +167,7 @@ No authorization required # **fakeOuterStringSerialize** ```swift - open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` @@ -181,7 +181,7 @@ import PetstoreClient let body = "body_example" // String | Input string as post body (optional) -FakeAPI.fakeOuterStringSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterStringSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -216,7 +216,7 @@ No authorization required # **testBodyWithFileSchema** ```swift - open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -230,7 +230,7 @@ import PetstoreClient let body = FileSchemaTestClass(file: File(sourceURI: "sourceURI_example"), files: [nil]) // FileSchemaTestClass | -FakeAPI.testBodyWithFileSchema(body: body) { (response, error) in +FakeAPI().testBodyWithFileSchema(body: body) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ No authorization required # **testBodyWithQueryParams** ```swift - open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -278,7 +278,7 @@ import PetstoreClient let query = "query_example" // String | let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | -FakeAPI.testBodyWithQueryParams(query: query, body: body) { (response, error) in +FakeAPI().testBodyWithQueryParams(query: query, body: body) { (response, error) in guard error == nil else { print(error) return @@ -314,7 +314,7 @@ No authorization required # **testClientModel** ```swift - open class func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test \"client\" model @@ -329,7 +329,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test \"client\" model -FakeAPI.testClientModel(body: body) { (response, error) in +FakeAPI().testClientModel(body: body) { (response, error) in guard error == nil else { print(error) return @@ -364,7 +364,7 @@ No authorization required # **testEndpointParameters** ```swift - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: OpenAPIDateWithoutTime? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: OpenAPIDateWithoutTime? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -392,7 +392,7 @@ let password = "password_example" // String | None (optional) let callback = "callback_example" // String | None (optional) // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 -FakeAPI.testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in +FakeAPI().testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in guard error == nil else { print(error) return @@ -440,7 +440,7 @@ Void (empty response body) # **testEnumParameters** ```swift - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` To test enum parameters @@ -462,7 +462,7 @@ let enumFormStringArray = ["inner_example"] // [String] | Form parameter enum te let enumFormString = "enumFormString_example" // String | Form parameter enum test (string) (optional) (default to .efg) // To test enum parameters -FakeAPI.testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in +FakeAPI().testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in guard error == nil else { print(error) return @@ -504,7 +504,7 @@ No authorization required # **testGroupParameters** ```swift - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint to test group parameters (optional) @@ -524,7 +524,7 @@ let booleanGroup = true // Bool | Boolean in group parameters (optional) let int64Group = 987 // Int64 | Integer in group parameters (optional) // Fake endpoint to test group parameters (optional) -FakeAPI.testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in +FakeAPI().testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in guard error == nil else { print(error) return @@ -564,7 +564,7 @@ No authorization required # **testInlineAdditionalProperties** ```swift - open class func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test inline additionalProperties @@ -577,7 +577,7 @@ import PetstoreClient let param = "TODO" // [String: String] | request body // test inline additionalProperties -FakeAPI.testInlineAdditionalProperties(param: param) { (response, error) in +FakeAPI().testInlineAdditionalProperties(param: param) { (response, error) in guard error == nil else { print(error) return @@ -612,7 +612,7 @@ No authorization required # **testJsonFormData** ```swift - open class func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test json serialization of form data @@ -626,7 +626,7 @@ let param = "param_example" // String | field1 let param2 = "param2_example" // String | field2 // test json serialization of form data -FakeAPI.testJsonFormData(param: param, param2: param2) { (response, error) in +FakeAPI().testJsonFormData(param: param, param2: param2) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/alamofireLibrary/docs/FakeClassnameTags123API.md b/samples/client/petstore/swift5/alamofireLibrary/docs/FakeClassnameTags123API.md index 5b9b66073fe0..7ef18c9cc1d5 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/docs/FakeClassnameTags123API.md +++ b/samples/client/petstore/swift5/alamofireLibrary/docs/FakeClassnameTags123API.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **testClassname** ```swift - open class func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test class name in snake case @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test class name in snake case -FakeClassnameTags123API.testClassname(body: body) { (response, error) in +FakeClassnameTags123API().testClassname(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/alamofireLibrary/docs/PetAPI.md b/samples/client/petstore/swift5/alamofireLibrary/docs/PetAPI.md index e6219c37c4ec..12cd425b07b8 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/docs/PetAPI.md +++ b/samples/client/petstore/swift5/alamofireLibrary/docs/PetAPI.md @@ -17,7 +17,7 @@ Method | HTTP request | Description # **addPet** ```swift - open class func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Add a new pet to the store @@ -30,7 +30,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Add a new pet to the store -PetAPI.addPet(body: body) { (response, error) in +PetAPI().addPet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -65,7 +65,7 @@ Void (empty response body) # **deletePet** ```swift - open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Deletes a pet @@ -79,7 +79,7 @@ let petId = 987 // Int64 | Pet id to delete let apiKey = "apiKey_example" // String | (optional) // Deletes a pet -PetAPI.deletePet(petId: petId, apiKey: apiKey) { (response, error) in +PetAPI().deletePet(petId: petId, apiKey: apiKey) { (response, error) in guard error == nil else { print(error) return @@ -115,7 +115,7 @@ Void (empty response body) # **findPetsByStatus** ```swift - open class func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + open func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by status @@ -130,7 +130,7 @@ import PetstoreClient let status = ["status_example"] // [String] | Status values that need to be considered for filter // Finds Pets by status -PetAPI.findPetsByStatus(status: status) { (response, error) in +PetAPI().findPetsByStatus(status: status) { (response, error) in guard error == nil else { print(error) return @@ -165,7 +165,7 @@ Name | Type | Description | Notes # **findPetsByTags** ```swift - open class func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + open func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by tags @@ -180,7 +180,7 @@ import PetstoreClient let tags = ["inner_example"] // [String] | Tags to filter by // Finds Pets by tags -PetAPI.findPetsByTags(tags: tags) { (response, error) in +PetAPI().findPetsByTags(tags: tags) { (response, error) in guard error == nil else { print(error) return @@ -215,7 +215,7 @@ Name | Type | Description | Notes # **getPetById** ```swift - open class func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) + open func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) ``` Find pet by ID @@ -230,7 +230,7 @@ import PetstoreClient let petId = 987 // Int64 | ID of pet to return // Find pet by ID -PetAPI.getPetById(petId: petId) { (response, error) in +PetAPI().getPetById(petId: petId) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ Name | Type | Description | Notes # **updatePet** ```swift - open class func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Update an existing pet @@ -278,7 +278,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Update an existing pet -PetAPI.updatePet(body: body) { (response, error) in +PetAPI().updatePet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -313,7 +313,7 @@ Void (empty response body) # **updatePetWithForm** ```swift - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updates a pet in the store with form data @@ -328,7 +328,7 @@ let name = "name_example" // String | Updated name of the pet (optional) let status = "status_example" // String | Updated status of the pet (optional) // Updates a pet in the store with form data -PetAPI.updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in +PetAPI().updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in guard error == nil else { print(error) return @@ -365,7 +365,7 @@ Void (empty response body) # **uploadFile** ```swift - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image @@ -380,7 +380,7 @@ let additionalMetadata = "additionalMetadata_example" // String | Additional dat let file = URL(string: "https://example.com")! // URL | file to upload (optional) // uploads an image -PetAPI.uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in +PetAPI().uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in guard error == nil else { print(error) return @@ -417,7 +417,7 @@ Name | Type | Description | Notes # **uploadFileWithRequiredFile** ```swift - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image (required) @@ -432,7 +432,7 @@ let requiredFile = URL(string: "https://example.com")! // URL | file to upload let additionalMetadata = "additionalMetadata_example" // String | Additional data to pass to server (optional) // uploads an image (required) -PetAPI.uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in +PetAPI().uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/alamofireLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/alamofireLibrary/docs/StoreAPI.md index edb75e33b70b..3375f6ac5c73 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/docs/StoreAPI.md +++ b/samples/client/petstore/swift5/alamofireLibrary/docs/StoreAPI.md @@ -12,7 +12,7 @@ Method | HTTP request | Description # **deleteOrder** ```swift - open class func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete purchase order by ID @@ -27,7 +27,7 @@ import PetstoreClient let orderId = "orderId_example" // String | ID of the order that needs to be deleted // Delete purchase order by ID -StoreAPI.deleteOrder(orderId: orderId) { (response, error) in +StoreAPI().deleteOrder(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -62,7 +62,7 @@ No authorization required # **getInventory** ```swift - open class func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) + open func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) ``` Returns pet inventories by status @@ -76,7 +76,7 @@ import PetstoreClient // Returns pet inventories by status -StoreAPI.getInventory() { (response, error) in +StoreAPI().getInventory() { (response, error) in guard error == nil else { print(error) return @@ -108,7 +108,7 @@ This endpoint does not need any parameter. # **getOrderById** ```swift - open class func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Find purchase order by ID @@ -123,7 +123,7 @@ import PetstoreClient let orderId = 987 // Int64 | ID of pet that needs to be fetched // Find purchase order by ID -StoreAPI.getOrderById(orderId: orderId) { (response, error) in +StoreAPI().getOrderById(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -158,7 +158,7 @@ No authorization required # **placeOrder** ```swift - open class func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Place an order for a pet @@ -171,7 +171,7 @@ import PetstoreClient let body = Order(id: 123, petId: 123, quantity: 123, shipDate: Date(), status: "status_example", complete: false) // Order | order placed for purchasing the pet // Place an order for a pet -StoreAPI.placeOrder(body: body) { (response, error) in +StoreAPI().placeOrder(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/alamofireLibrary/docs/UserAPI.md b/samples/client/petstore/swift5/alamofireLibrary/docs/UserAPI.md index 5fc9160daf47..54ad86b31144 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/docs/UserAPI.md +++ b/samples/client/petstore/swift5/alamofireLibrary/docs/UserAPI.md @@ -16,7 +16,7 @@ Method | HTTP request | Description # **createUser** ```swift - open class func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Create user @@ -31,7 +31,7 @@ import PetstoreClient let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Created user object // Create user -UserAPI.createUser(body: body) { (response, error) in +UserAPI().createUser(body: body) { (response, error) in guard error == nil else { print(error) return @@ -66,7 +66,7 @@ No authorization required # **createUsersWithArrayInput** ```swift - open class func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -79,7 +79,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithArrayInput(body: body) { (response, error) in +UserAPI().createUsersWithArrayInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -114,7 +114,7 @@ No authorization required # **createUsersWithListInput** ```swift - open class func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -127,7 +127,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithListInput(body: body) { (response, error) in +UserAPI().createUsersWithListInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -162,7 +162,7 @@ No authorization required # **deleteUser** ```swift - open class func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete user @@ -177,7 +177,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be deleted // Delete user -UserAPI.deleteUser(username: username) { (response, error) in +UserAPI().deleteUser(username: username) { (response, error) in guard error == nil else { print(error) return @@ -212,7 +212,7 @@ No authorization required # **getUserByName** ```swift - open class func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) + open func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) ``` Get user by user name @@ -225,7 +225,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be fetched. Use user1 for testing. // Get user by user name -UserAPI.getUserByName(username: username) { (response, error) in +UserAPI().getUserByName(username: username) { (response, error) in guard error == nil else { print(error) return @@ -260,7 +260,7 @@ No authorization required # **loginUser** ```swift - open class func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` Logs user into the system @@ -274,7 +274,7 @@ let username = "username_example" // String | The user name for login let password = "password_example" // String | The password for login in clear text // Logs user into the system -UserAPI.loginUser(username: username, password: password) { (response, error) in +UserAPI().loginUser(username: username, password: password) { (response, error) in guard error == nil else { print(error) return @@ -310,7 +310,7 @@ No authorization required # **logoutUser** ```swift - open class func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Logs out current logged in user session @@ -322,7 +322,7 @@ import PetstoreClient // Logs out current logged in user session -UserAPI.logoutUser() { (response, error) in +UserAPI().logoutUser() { (response, error) in guard error == nil else { print(error) return @@ -354,7 +354,7 @@ No authorization required # **updateUser** ```swift - open class func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updated user @@ -370,7 +370,7 @@ let username = "username_example" // String | name that need to be deleted let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Updated user object // Updated user -UserAPI.updateUser(username: username, body: body) { (response, error) in +UserAPI().updateUser(username: username, body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 9e5d3c0a772d..3f883594d9ae 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -28,15 +28,13 @@ open class RequestBuilder { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders(PetstoreClientAPI.customHeaders) - addCredential() + self.credential = credential } open func addHeaders(_ aHeaders: [String: String]) { @@ -82,8 +80,8 @@ open class RequestBuilder { return self } - open func addCredential() { - credential = PetstoreClientAPI.credential + open func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index 51cfb6d716ee..ecacf50a5f9d 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class AnotherFakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test special tags @@ -19,7 +38,7 @@ open class AnotherFakeAPI { - returns: Client */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func call123testSpecialTags(body: Client) async throws -> Client { + open func call123testSpecialTags(body: Client) async throws -> Client { return try await call123testSpecialTagsWithRequestBuilder(body: body).execute().body } @@ -30,9 +49,9 @@ open class AnotherFakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { + open func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/another-fake/dummy" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -41,10 +60,13 @@ open class AnotherFakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index a5e7145d297c..3a2d2b71de35 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class FakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** @@ -18,7 +37,7 @@ open class FakeAPI { - returns: Bool */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func fakeOuterBooleanSerialize(body: Bool? = nil) async throws -> Bool { + open func fakeOuterBooleanSerialize(body: Bool? = nil) async throws -> Bool { return try await fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute().body } @@ -28,9 +47,9 @@ open class FakeAPI { - parameter body: (body) Input boolean as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { + open func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/boolean" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -39,11 +58,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -52,7 +74,7 @@ open class FakeAPI { - returns: OuterComposite */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil) async throws -> OuterComposite { + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil) async throws -> OuterComposite { return try await fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute().body } @@ -62,9 +84,9 @@ open class FakeAPI { - parameter body: (body) Input composite as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { + open func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/composite" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -73,11 +95,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -86,7 +111,7 @@ open class FakeAPI { - returns: Double */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func fakeOuterNumberSerialize(body: Double? = nil) async throws -> Double { + open func fakeOuterNumberSerialize(body: Double? = nil) async throws -> Double { return try await fakeOuterNumberSerializeWithRequestBuilder(body: body).execute().body } @@ -96,9 +121,9 @@ open class FakeAPI { - parameter body: (body) Input number as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { + open func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/number" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -107,11 +132,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -120,7 +148,7 @@ open class FakeAPI { - returns: String */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func fakeOuterStringSerialize(body: String? = nil) async throws -> String { + open func fakeOuterStringSerialize(body: String? = nil) async throws -> String { return try await fakeOuterStringSerializeWithRequestBuilder(body: body).execute().body } @@ -130,9 +158,9 @@ open class FakeAPI { - parameter body: (body) Input string as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { + open func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/string" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -141,11 +169,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -154,7 +185,7 @@ open class FakeAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testBodyWithFileSchema(body: FileSchemaTestClass) async throws { + open func testBodyWithFileSchema(body: FileSchemaTestClass) async throws { return try await testBodyWithFileSchemaWithRequestBuilder(body: body).execute().body } @@ -164,9 +195,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { + open func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { let localVariablePath = "/fake/body-with-file-schema" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -175,11 +206,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -189,7 +223,7 @@ open class FakeAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testBodyWithQueryParams(query: String, body: User) async throws { + open func testBodyWithQueryParams(query: String, body: User) async throws { return try await testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute().body } @@ -199,9 +233,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { + open func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { let localVariablePath = "/fake/body-with-query-params" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -213,11 +247,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -227,7 +264,7 @@ open class FakeAPI { - returns: Client */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testClientModel(body: Client) async throws -> Client { + open func testClientModel(body: Client) async throws -> Client { return try await testClientModelWithRequestBuilder(body: body).execute().body } @@ -238,9 +275,9 @@ open class FakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -249,11 +286,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -276,7 +316,7 @@ open class FakeAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) async throws { + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) async throws { return try await testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute().body } @@ -303,9 +343,9 @@ open class FakeAPI { - parameter callback: (form) None (optional) - returns: RequestBuilder */ - open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { + open func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "integer": integer?.encodeToJSON(), "int32": int32?.encodeToJSON(), @@ -332,11 +372,14 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -420,7 +463,7 @@ open class FakeAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) async throws { + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) async throws { return try await testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute().body } @@ -438,9 +481,9 @@ open class FakeAPI { - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: RequestBuilder */ - open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { + open func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "enum_form_string_array": enumFormStringArray?.encodeToJSON(), "enum_form_string": enumFormString?.encodeToJSON(), @@ -463,11 +506,14 @@ open class FakeAPI { "enum_header_string": enumHeaderString?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -482,7 +528,7 @@ open class FakeAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) async throws { + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) async throws { return try await testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute().body } @@ -498,9 +544,9 @@ open class FakeAPI { - parameter int64Group: (query) Integer in group parameters (optional) - returns: RequestBuilder */ - open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { + open func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -516,11 +562,14 @@ open class FakeAPI { "boolean_group": booleanGroup?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -530,7 +579,7 @@ open class FakeAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testInlineAdditionalProperties(param: [String: String]) async throws { + open func testInlineAdditionalProperties(param: [String: String]) async throws { return try await testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute().body } @@ -540,9 +589,9 @@ open class FakeAPI { - parameter param: (body) request body - returns: RequestBuilder */ - open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { + open func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { let localVariablePath = "/fake/inline-additionalProperties" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -551,11 +600,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -566,7 +618,7 @@ open class FakeAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testJsonFormData(param: String, param2: String) async throws { + open func testJsonFormData(param: String, param2: String) async throws { return try await testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute().body } @@ -577,9 +629,9 @@ open class FakeAPI { - parameter param2: (form) field2 - returns: RequestBuilder */ - open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { + open func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "param": param.encodeToJSON(), "param2": param2.encodeToJSON(), @@ -594,10 +646,13 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index c799d91e6b5d..76e8106a252d 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class FakeClassnameTags123API { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test class name in snake case @@ -19,7 +38,7 @@ open class FakeClassnameTags123API { - returns: Client */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testClassname(body: Client) async throws -> Client { + open func testClassname(body: Client) async throws -> Client { return try await testClassnameWithRequestBuilder(body: body).execute().body } @@ -33,9 +52,9 @@ open class FakeClassnameTags123API { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake_classname_test" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -44,10 +63,13 @@ open class FakeClassnameTags123API { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index dfefa61d1d58..ff6200e1eed1 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class PetAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Add a new pet to the store @@ -19,7 +38,7 @@ open class PetAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func addPet(body: Pet) async throws { + open func addPet(body: Pet) async throws { return try await addPetWithRequestBuilder(body: body).execute().body } @@ -35,9 +54,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -46,11 +65,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -61,7 +83,7 @@ open class PetAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func deletePet(petId: Int64, apiKey: String? = nil) async throws { + open func deletePet(petId: Int64, apiKey: String? = nil) async throws { return try await deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute().body } @@ -75,12 +97,12 @@ open class PetAPI { - parameter apiKey: (header) (optional) - returns: RequestBuilder */ - open class func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { + open func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -89,11 +111,14 @@ open class PetAPI { "api_key": apiKey?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -112,7 +137,7 @@ open class PetAPI { - returns: [Pet] */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func findPetsByStatus(status: [Status_findPetsByStatus]) async throws -> [Pet] { + open func findPetsByStatus(status: [Status_findPetsByStatus]) async throws -> [Pet] { return try await findPetsByStatusWithRequestBuilder(status: status).execute().body } @@ -126,9 +151,9 @@ open class PetAPI { - parameter status: (query) Status values that need to be considered for filter - returns: RequestBuilder<[Pet]> */ - open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { + open func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -140,11 +165,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -155,7 +183,7 @@ open class PetAPI { */ @available(*, deprecated, message: "This operation is deprecated.") @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func findPetsByTags(tags: [String]) async throws -> [Pet] { + open func findPetsByTags(tags: [String]) async throws -> [Pet] { return try await findPetsByTagsWithRequestBuilder(tags: tags).execute().body } @@ -170,9 +198,9 @@ open class PetAPI { - returns: RequestBuilder<[Pet]> */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { + open func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -184,11 +212,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -198,7 +229,7 @@ open class PetAPI { - returns: Pet */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func getPetById(petId: Int64) async throws -> Pet { + open func getPetById(petId: Int64) async throws -> Pet { return try await getPetByIdWithRequestBuilder(petId: petId).execute().body } @@ -212,12 +243,12 @@ open class PetAPI { - parameter petId: (path) ID of pet to return - returns: RequestBuilder */ - open class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { + open func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -226,11 +257,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -240,7 +274,7 @@ open class PetAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func updatePet(body: Pet) async throws { + open func updatePet(body: Pet) async throws { return try await updatePetWithRequestBuilder(body: body).execute().body } @@ -253,9 +287,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -264,11 +298,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -280,7 +317,7 @@ open class PetAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil) async throws { + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil) async throws { return try await updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute().body } @@ -295,12 +332,12 @@ open class PetAPI { - parameter status: (form) Updated status of the pet (optional) - returns: RequestBuilder */ - open class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { + open func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "name": name?.encodeToJSON(), "status": status?.encodeToJSON(), @@ -315,11 +352,14 @@ open class PetAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -331,7 +371,7 @@ open class PetAPI { - returns: ApiResponse */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) async throws -> ApiResponse { + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) async throws -> ApiResponse { return try await uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute().body } @@ -346,12 +386,12 @@ open class PetAPI { - parameter file: (form) file to upload (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { + open func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}/uploadImage" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "file": file?.encodeToJSON(), @@ -366,11 +406,14 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -382,7 +425,7 @@ open class PetAPI { - returns: ApiResponse */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) async throws -> ApiResponse { + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) async throws -> ApiResponse { return try await uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute().body } @@ -397,12 +440,12 @@ open class PetAPI { - parameter additionalMetadata: (form) Additional data to pass to server (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { + open func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { var localVariablePath = "/fake/{petId}/uploadImageWithRequiredFile" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "requiredFile": requiredFile.encodeToJSON(), @@ -417,10 +460,13 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index 6d59ddefaf93..1c57a5d186ec 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class StoreAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Delete purchase order by ID @@ -19,7 +38,7 @@ open class StoreAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func deleteOrder(orderId: String) async throws { + open func deleteOrder(orderId: String) async throws { return try await deleteOrderWithRequestBuilder(orderId: orderId).execute().body } @@ -30,12 +49,12 @@ open class StoreAPI { - parameter orderId: (path) ID of the order that needs to be deleted - returns: RequestBuilder */ - open class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { + open func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -44,11 +63,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -57,7 +79,7 @@ open class StoreAPI { - returns: [String: Int] */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func getInventory() async throws -> [String: Int] { + open func getInventory() async throws -> [String: Int] { return try await getInventoryWithRequestBuilder().execute().body } @@ -70,9 +92,9 @@ open class StoreAPI { - name: api_key - returns: RequestBuilder<[String: Int]> */ - open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { + open func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -81,11 +103,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -95,7 +120,7 @@ open class StoreAPI { - returns: Order */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func getOrderById(orderId: Int64) async throws -> Order { + open func getOrderById(orderId: Int64) async throws -> Order { return try await getOrderByIdWithRequestBuilder(orderId: orderId).execute().body } @@ -106,12 +131,12 @@ open class StoreAPI { - parameter orderId: (path) ID of pet that needs to be fetched - returns: RequestBuilder */ - open class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { + open func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -120,11 +145,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -134,7 +162,7 @@ open class StoreAPI { - returns: Order */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func placeOrder(body: Order) async throws -> Order { + open func placeOrder(body: Order) async throws -> Order { return try await placeOrderWithRequestBuilder(body: body).execute().body } @@ -144,9 +172,9 @@ open class StoreAPI { - parameter body: (body) order placed for purchasing the pet - returns: RequestBuilder */ - open class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { + open func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { let localVariablePath = "/store/order" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -155,10 +183,13 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index 01fab8835f9e..5fac21cfe154 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class UserAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Create user @@ -19,7 +38,7 @@ open class UserAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func createUser(body: User) async throws { + open func createUser(body: User) async throws { return try await createUserWithRequestBuilder(body: body).execute().body } @@ -30,9 +49,9 @@ open class UserAPI { - parameter body: (body) Created user object - returns: RequestBuilder */ - open class func createUserWithRequestBuilder(body: User) -> RequestBuilder { + open func createUserWithRequestBuilder(body: User) -> RequestBuilder { let localVariablePath = "/user" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -41,11 +60,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -55,7 +77,7 @@ open class UserAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func createUsersWithArrayInput(body: [User]) async throws { + open func createUsersWithArrayInput(body: [User]) async throws { return try await createUsersWithArrayInputWithRequestBuilder(body: body).execute().body } @@ -65,9 +87,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithArray" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -76,11 +98,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -90,7 +115,7 @@ open class UserAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func createUsersWithListInput(body: [User]) async throws { + open func createUsersWithListInput(body: [User]) async throws { return try await createUsersWithListInputWithRequestBuilder(body: body).execute().body } @@ -100,9 +125,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithList" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -111,11 +136,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -125,7 +153,7 @@ open class UserAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func deleteUser(username: String) async throws { + open func deleteUser(username: String) async throws { return try await deleteUserWithRequestBuilder(username: username).execute().body } @@ -136,12 +164,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be deleted - returns: RequestBuilder */ - open class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { + open func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -150,11 +178,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -164,7 +195,7 @@ open class UserAPI { - returns: User */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func getUserByName(username: String) async throws -> User { + open func getUserByName(username: String) async throws -> User { return try await getUserByNameWithRequestBuilder(username: username).execute().body } @@ -174,12 +205,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: RequestBuilder */ - open class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { + open func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -188,11 +219,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -203,7 +237,7 @@ open class UserAPI { - returns: String */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func loginUser(username: String, password: String) async throws -> String { + open func loginUser(username: String, password: String) async throws -> String { return try await loginUserWithRequestBuilder(username: username, password: password).execute().body } @@ -215,9 +249,9 @@ open class UserAPI { - parameter password: (query) The password for login in clear text - returns: RequestBuilder */ - open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { + open func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { let localVariablePath = "/user/login" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -230,11 +264,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -243,7 +280,7 @@ open class UserAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func logoutUser() async throws { + open func logoutUser() async throws { return try await logoutUserWithRequestBuilder().execute().body } @@ -252,9 +289,9 @@ open class UserAPI { - GET /user/logout - returns: RequestBuilder */ - open class func logoutUserWithRequestBuilder() -> RequestBuilder { + open func logoutUserWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/user/logout" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -263,11 +300,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -278,7 +318,7 @@ open class UserAPI { - returns: Void */ @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func updateUser(username: String, body: User) async throws { + open func updateUser(username: String, body: User) async throws { return try await updateUserWithRequestBuilder(username: username, body: body).execute().body } @@ -290,12 +330,12 @@ open class UserAPI { - parameter body: (body) Updated user object - returns: RequestBuilder */ - open class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { + open func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -304,10 +344,13 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 6fa4d0e20eb9..3f3e8894c3d6 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -71,8 +71,8 @@ open class URLSessionRequestBuilder: RequestBuilder { */ public var taskDidReceiveChallenge: PetstoreClientAPIChallengeHandler? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/AnotherFakeAPI.md b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/AnotherFakeAPI.md index 26346e81a4cb..47c30277fb98 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/AnotherFakeAPI.md +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/AnotherFakeAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **call123testSpecialTags** ```swift - open class func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test special tags @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test special tags -AnotherFakeAPI.call123testSpecialTags(body: body) { (response, error) in +AnotherFakeAPI().call123testSpecialTags(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/FakeAPI.md b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/FakeAPI.md index 69b1faa2b991..9df703b7b5d2 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/FakeAPI.md +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/FakeAPI.md @@ -20,7 +20,7 @@ Method | HTTP request | Description # **fakeOuterBooleanSerialize** ```swift - open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) + open func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) ``` @@ -34,7 +34,7 @@ import PetstoreClient let body = true // Bool | Input boolean as post body (optional) -FakeAPI.fakeOuterBooleanSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterBooleanSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -69,7 +69,7 @@ No authorization required # **fakeOuterCompositeSerialize** ```swift - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) ``` @@ -83,7 +83,7 @@ import PetstoreClient let body = OuterComposite(myNumber: 123, myString: "myString_example", myBoolean: false) // OuterComposite | Input composite as post body (optional) -FakeAPI.fakeOuterCompositeSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterCompositeSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -118,7 +118,7 @@ No authorization required # **fakeOuterNumberSerialize** ```swift - open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) + open func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) ``` @@ -132,7 +132,7 @@ import PetstoreClient let body = 987 // Double | Input number as post body (optional) -FakeAPI.fakeOuterNumberSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterNumberSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -167,7 +167,7 @@ No authorization required # **fakeOuterStringSerialize** ```swift - open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` @@ -181,7 +181,7 @@ import PetstoreClient let body = "body_example" // String | Input string as post body (optional) -FakeAPI.fakeOuterStringSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterStringSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -216,7 +216,7 @@ No authorization required # **testBodyWithFileSchema** ```swift - open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -230,7 +230,7 @@ import PetstoreClient let body = FileSchemaTestClass(file: File(sourceURI: "sourceURI_example"), files: [nil]) // FileSchemaTestClass | -FakeAPI.testBodyWithFileSchema(body: body) { (response, error) in +FakeAPI().testBodyWithFileSchema(body: body) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ No authorization required # **testBodyWithQueryParams** ```swift - open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -278,7 +278,7 @@ import PetstoreClient let query = "query_example" // String | let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | -FakeAPI.testBodyWithQueryParams(query: query, body: body) { (response, error) in +FakeAPI().testBodyWithQueryParams(query: query, body: body) { (response, error) in guard error == nil else { print(error) return @@ -314,7 +314,7 @@ No authorization required # **testClientModel** ```swift - open class func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test \"client\" model @@ -329,7 +329,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test \"client\" model -FakeAPI.testClientModel(body: body) { (response, error) in +FakeAPI().testClientModel(body: body) { (response, error) in guard error == nil else { print(error) return @@ -364,7 +364,7 @@ No authorization required # **testEndpointParameters** ```swift - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -392,7 +392,7 @@ let password = "password_example" // String | None (optional) let callback = "callback_example" // String | None (optional) // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 -FakeAPI.testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in +FakeAPI().testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in guard error == nil else { print(error) return @@ -440,7 +440,7 @@ Void (empty response body) # **testEnumParameters** ```swift - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` To test enum parameters @@ -462,7 +462,7 @@ let enumFormStringArray = ["inner_example"] // [String] | Form parameter enum te let enumFormString = "enumFormString_example" // String | Form parameter enum test (string) (optional) (default to .efg) // To test enum parameters -FakeAPI.testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in +FakeAPI().testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in guard error == nil else { print(error) return @@ -504,7 +504,7 @@ No authorization required # **testGroupParameters** ```swift - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint to test group parameters (optional) @@ -524,7 +524,7 @@ let booleanGroup = true // Bool | Boolean in group parameters (optional) let int64Group = 987 // Int64 | Integer in group parameters (optional) // Fake endpoint to test group parameters (optional) -FakeAPI.testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in +FakeAPI().testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in guard error == nil else { print(error) return @@ -564,7 +564,7 @@ No authorization required # **testInlineAdditionalProperties** ```swift - open class func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test inline additionalProperties @@ -577,7 +577,7 @@ import PetstoreClient let param = "TODO" // [String: String] | request body // test inline additionalProperties -FakeAPI.testInlineAdditionalProperties(param: param) { (response, error) in +FakeAPI().testInlineAdditionalProperties(param: param) { (response, error) in guard error == nil else { print(error) return @@ -612,7 +612,7 @@ No authorization required # **testJsonFormData** ```swift - open class func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test json serialization of form data @@ -626,7 +626,7 @@ let param = "param_example" // String | field1 let param2 = "param2_example" // String | field2 // test json serialization of form data -FakeAPI.testJsonFormData(param: param, param2: param2) { (response, error) in +FakeAPI().testJsonFormData(param: param, param2: param2) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/FakeClassnameTags123API.md b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/FakeClassnameTags123API.md index 5b9b66073fe0..7ef18c9cc1d5 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/FakeClassnameTags123API.md +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/FakeClassnameTags123API.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **testClassname** ```swift - open class func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test class name in snake case @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test class name in snake case -FakeClassnameTags123API.testClassname(body: body) { (response, error) in +FakeClassnameTags123API().testClassname(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/PetAPI.md b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/PetAPI.md index e6219c37c4ec..12cd425b07b8 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/PetAPI.md +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/PetAPI.md @@ -17,7 +17,7 @@ Method | HTTP request | Description # **addPet** ```swift - open class func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Add a new pet to the store @@ -30,7 +30,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Add a new pet to the store -PetAPI.addPet(body: body) { (response, error) in +PetAPI().addPet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -65,7 +65,7 @@ Void (empty response body) # **deletePet** ```swift - open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Deletes a pet @@ -79,7 +79,7 @@ let petId = 987 // Int64 | Pet id to delete let apiKey = "apiKey_example" // String | (optional) // Deletes a pet -PetAPI.deletePet(petId: petId, apiKey: apiKey) { (response, error) in +PetAPI().deletePet(petId: petId, apiKey: apiKey) { (response, error) in guard error == nil else { print(error) return @@ -115,7 +115,7 @@ Void (empty response body) # **findPetsByStatus** ```swift - open class func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + open func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by status @@ -130,7 +130,7 @@ import PetstoreClient let status = ["status_example"] // [String] | Status values that need to be considered for filter // Finds Pets by status -PetAPI.findPetsByStatus(status: status) { (response, error) in +PetAPI().findPetsByStatus(status: status) { (response, error) in guard error == nil else { print(error) return @@ -165,7 +165,7 @@ Name | Type | Description | Notes # **findPetsByTags** ```swift - open class func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + open func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by tags @@ -180,7 +180,7 @@ import PetstoreClient let tags = ["inner_example"] // [String] | Tags to filter by // Finds Pets by tags -PetAPI.findPetsByTags(tags: tags) { (response, error) in +PetAPI().findPetsByTags(tags: tags) { (response, error) in guard error == nil else { print(error) return @@ -215,7 +215,7 @@ Name | Type | Description | Notes # **getPetById** ```swift - open class func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) + open func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) ``` Find pet by ID @@ -230,7 +230,7 @@ import PetstoreClient let petId = 987 // Int64 | ID of pet to return // Find pet by ID -PetAPI.getPetById(petId: petId) { (response, error) in +PetAPI().getPetById(petId: petId) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ Name | Type | Description | Notes # **updatePet** ```swift - open class func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Update an existing pet @@ -278,7 +278,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Update an existing pet -PetAPI.updatePet(body: body) { (response, error) in +PetAPI().updatePet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -313,7 +313,7 @@ Void (empty response body) # **updatePetWithForm** ```swift - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updates a pet in the store with form data @@ -328,7 +328,7 @@ let name = "name_example" // String | Updated name of the pet (optional) let status = "status_example" // String | Updated status of the pet (optional) // Updates a pet in the store with form data -PetAPI.updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in +PetAPI().updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in guard error == nil else { print(error) return @@ -365,7 +365,7 @@ Void (empty response body) # **uploadFile** ```swift - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image @@ -380,7 +380,7 @@ let additionalMetadata = "additionalMetadata_example" // String | Additional dat let file = URL(string: "https://example.com")! // URL | file to upload (optional) // uploads an image -PetAPI.uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in +PetAPI().uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in guard error == nil else { print(error) return @@ -417,7 +417,7 @@ Name | Type | Description | Notes # **uploadFileWithRequiredFile** ```swift - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image (required) @@ -432,7 +432,7 @@ let requiredFile = URL(string: "https://example.com")! // URL | file to upload let additionalMetadata = "additionalMetadata_example" // String | Additional data to pass to server (optional) // uploads an image (required) -PetAPI.uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in +PetAPI().uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/StoreAPI.md index edb75e33b70b..3375f6ac5c73 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/StoreAPI.md +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/StoreAPI.md @@ -12,7 +12,7 @@ Method | HTTP request | Description # **deleteOrder** ```swift - open class func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete purchase order by ID @@ -27,7 +27,7 @@ import PetstoreClient let orderId = "orderId_example" // String | ID of the order that needs to be deleted // Delete purchase order by ID -StoreAPI.deleteOrder(orderId: orderId) { (response, error) in +StoreAPI().deleteOrder(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -62,7 +62,7 @@ No authorization required # **getInventory** ```swift - open class func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) + open func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) ``` Returns pet inventories by status @@ -76,7 +76,7 @@ import PetstoreClient // Returns pet inventories by status -StoreAPI.getInventory() { (response, error) in +StoreAPI().getInventory() { (response, error) in guard error == nil else { print(error) return @@ -108,7 +108,7 @@ This endpoint does not need any parameter. # **getOrderById** ```swift - open class func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Find purchase order by ID @@ -123,7 +123,7 @@ import PetstoreClient let orderId = 987 // Int64 | ID of pet that needs to be fetched // Find purchase order by ID -StoreAPI.getOrderById(orderId: orderId) { (response, error) in +StoreAPI().getOrderById(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -158,7 +158,7 @@ No authorization required # **placeOrder** ```swift - open class func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Place an order for a pet @@ -171,7 +171,7 @@ import PetstoreClient let body = Order(id: 123, petId: 123, quantity: 123, shipDate: Date(), status: "status_example", complete: false) // Order | order placed for purchasing the pet // Place an order for a pet -StoreAPI.placeOrder(body: body) { (response, error) in +StoreAPI().placeOrder(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/UserAPI.md b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/UserAPI.md index 5fc9160daf47..54ad86b31144 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/UserAPI.md +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/UserAPI.md @@ -16,7 +16,7 @@ Method | HTTP request | Description # **createUser** ```swift - open class func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Create user @@ -31,7 +31,7 @@ import PetstoreClient let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Created user object // Create user -UserAPI.createUser(body: body) { (response, error) in +UserAPI().createUser(body: body) { (response, error) in guard error == nil else { print(error) return @@ -66,7 +66,7 @@ No authorization required # **createUsersWithArrayInput** ```swift - open class func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -79,7 +79,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithArrayInput(body: body) { (response, error) in +UserAPI().createUsersWithArrayInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -114,7 +114,7 @@ No authorization required # **createUsersWithListInput** ```swift - open class func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -127,7 +127,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithListInput(body: body) { (response, error) in +UserAPI().createUsersWithListInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -162,7 +162,7 @@ No authorization required # **deleteUser** ```swift - open class func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete user @@ -177,7 +177,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be deleted // Delete user -UserAPI.deleteUser(username: username) { (response, error) in +UserAPI().deleteUser(username: username) { (response, error) in guard error == nil else { print(error) return @@ -212,7 +212,7 @@ No authorization required # **getUserByName** ```swift - open class func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) + open func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) ``` Get user by user name @@ -225,7 +225,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be fetched. Use user1 for testing. // Get user by user name -UserAPI.getUserByName(username: username) { (response, error) in +UserAPI().getUserByName(username: username) { (response, error) in guard error == nil else { print(error) return @@ -260,7 +260,7 @@ No authorization required # **loginUser** ```swift - open class func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` Logs user into the system @@ -274,7 +274,7 @@ let username = "username_example" // String | The user name for login let password = "password_example" // String | The password for login in clear text // Logs user into the system -UserAPI.loginUser(username: username, password: password) { (response, error) in +UserAPI().loginUser(username: username, password: password) { (response, error) in guard error == nil else { print(error) return @@ -310,7 +310,7 @@ No authorization required # **logoutUser** ```swift - open class func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Logs out current logged in user session @@ -322,7 +322,7 @@ import PetstoreClient // Logs out current logged in user session -UserAPI.logoutUser() { (response, error) in +UserAPI().logoutUser() { (response, error) in guard error == nil else { print(error) return @@ -354,7 +354,7 @@ No authorization required # **updateUser** ```swift - open class func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updated user @@ -370,7 +370,7 @@ let username = "username_example" // String | name that need to be deleted let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Updated user object // Updated user -UserAPI.updateUser(username: username, body: body) { (response, error) in +UserAPI().updateUser(username: username, body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3ad11a871d5a..49426a6f123a 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -28,15 +28,13 @@ open class RequestBuilder { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders(PetstoreClientAPI.customHeaders) - addCredential() + self.credential = credential } open func addHeaders(_ aHeaders: [String: String]) { @@ -57,8 +55,8 @@ open class RequestBuilder { return self } - open func addCredential() { - credential = PetstoreClientAPI.credential + open func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index db7aba6b321e..b35c505a4a29 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(Combine) import Combine #endif @@ -14,6 +17,22 @@ import AnyCodable #endif open class AnotherFakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test special tags @@ -23,7 +42,7 @@ open class AnotherFakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func call123testSpecialTags(body: Client) -> AnyPublisher { + open func call123testSpecialTags(body: Client) -> AnyPublisher { let requestBuilder = call123testSpecialTagsWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -50,9 +69,9 @@ open class AnotherFakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { + open func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/another-fake/dummy" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -61,10 +80,13 @@ open class AnotherFakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index e65abe35fcd4..88c05bfabce7 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(Combine) import Combine #endif @@ -14,6 +17,22 @@ import AnyCodable #endif open class FakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** @@ -22,7 +41,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func fakeOuterBooleanSerialize(body: Bool? = nil) -> AnyPublisher { + open func fakeOuterBooleanSerialize(body: Bool? = nil) -> AnyPublisher { let requestBuilder = fakeOuterBooleanSerializeWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -48,9 +67,9 @@ open class FakeAPI { - parameter body: (body) Input boolean as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { + open func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/boolean" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -59,11 +78,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -73,7 +95,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil) -> AnyPublisher { + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil) -> AnyPublisher { let requestBuilder = fakeOuterCompositeSerializeWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -99,9 +121,9 @@ open class FakeAPI { - parameter body: (body) Input composite as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { + open func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/composite" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -110,11 +132,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -124,7 +149,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func fakeOuterNumberSerialize(body: Double? = nil) -> AnyPublisher { + open func fakeOuterNumberSerialize(body: Double? = nil) -> AnyPublisher { let requestBuilder = fakeOuterNumberSerializeWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -150,9 +175,9 @@ open class FakeAPI { - parameter body: (body) Input number as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { + open func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/number" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -161,11 +186,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -175,7 +203,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func fakeOuterStringSerialize(body: String? = nil) -> AnyPublisher { + open func fakeOuterStringSerialize(body: String? = nil) -> AnyPublisher { let requestBuilder = fakeOuterStringSerializeWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -201,9 +229,9 @@ open class FakeAPI { - parameter body: (body) Input string as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { + open func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/string" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -212,11 +240,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -226,7 +257,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testBodyWithFileSchema(body: FileSchemaTestClass) -> AnyPublisher { + open func testBodyWithFileSchema(body: FileSchemaTestClass) -> AnyPublisher { let requestBuilder = testBodyWithFileSchemaWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -252,9 +283,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { + open func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { let localVariablePath = "/fake/body-with-file-schema" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -263,11 +294,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -278,7 +312,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testBodyWithQueryParams(query: String, body: User) -> AnyPublisher { + open func testBodyWithQueryParams(query: String, body: User) -> AnyPublisher { let requestBuilder = testBodyWithQueryParamsWithRequestBuilder(query: query, body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -304,9 +338,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { + open func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { let localVariablePath = "/fake/body-with-query-params" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -318,11 +352,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -333,7 +370,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testClientModel(body: Client) -> AnyPublisher { + open func testClientModel(body: Client) -> AnyPublisher { let requestBuilder = testClientModelWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -360,9 +397,9 @@ open class FakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -371,11 +408,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -399,7 +439,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> AnyPublisher { + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> AnyPublisher { let requestBuilder = testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) let requestTask = requestBuilder.requestTask return Future { promise in @@ -442,9 +482,9 @@ open class FakeAPI { - parameter callback: (form) None (optional) - returns: RequestBuilder */ - open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { + open func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "integer": integer?.encodeToJSON(), "int32": int32?.encodeToJSON(), @@ -471,11 +511,14 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -560,7 +603,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> AnyPublisher { + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> AnyPublisher { let requestBuilder = testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) let requestTask = requestBuilder.requestTask return Future { promise in @@ -594,9 +637,9 @@ open class FakeAPI { - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: RequestBuilder */ - open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { + open func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "enum_form_string_array": enumFormStringArray?.encodeToJSON(), "enum_form_string": enumFormString?.encodeToJSON(), @@ -619,11 +662,14 @@ open class FakeAPI { "enum_header_string": enumHeaderString?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -639,7 +685,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> AnyPublisher { + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> AnyPublisher { let requestBuilder = testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) let requestTask = requestBuilder.requestTask return Future { promise in @@ -671,9 +717,9 @@ open class FakeAPI { - parameter int64Group: (query) Integer in group parameters (optional) - returns: RequestBuilder */ - open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { + open func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -689,11 +735,14 @@ open class FakeAPI { "boolean_group": booleanGroup?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -704,7 +753,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testInlineAdditionalProperties(param: [String: String]) -> AnyPublisher { + open func testInlineAdditionalProperties(param: [String: String]) -> AnyPublisher { let requestBuilder = testInlineAdditionalPropertiesWithRequestBuilder(param: param) let requestTask = requestBuilder.requestTask return Future { promise in @@ -730,9 +779,9 @@ open class FakeAPI { - parameter param: (body) request body - returns: RequestBuilder */ - open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { + open func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { let localVariablePath = "/fake/inline-additionalProperties" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -741,11 +790,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -757,7 +809,7 @@ open class FakeAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testJsonFormData(param: String, param2: String) -> AnyPublisher { + open func testJsonFormData(param: String, param2: String) -> AnyPublisher { let requestBuilder = testJsonFormDataWithRequestBuilder(param: param, param2: param2) let requestTask = requestBuilder.requestTask return Future { promise in @@ -784,9 +836,9 @@ open class FakeAPI { - parameter param2: (form) field2 - returns: RequestBuilder */ - open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { + open func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "param": param.encodeToJSON(), "param2": param2.encodeToJSON(), @@ -801,10 +853,13 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index 7958821e05cf..9539a0d853c9 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(Combine) import Combine #endif @@ -14,6 +17,22 @@ import AnyCodable #endif open class FakeClassnameTags123API { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test class name in snake case @@ -23,7 +42,7 @@ open class FakeClassnameTags123API { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func testClassname(body: Client) -> AnyPublisher { + open func testClassname(body: Client) -> AnyPublisher { let requestBuilder = testClassnameWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -53,9 +72,9 @@ open class FakeClassnameTags123API { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake_classname_test" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -64,10 +83,13 @@ open class FakeClassnameTags123API { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index b206cde011e3..cbc215b3839a 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(Combine) import Combine #endif @@ -14,6 +17,22 @@ import AnyCodable #endif open class PetAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Add a new pet to the store @@ -23,7 +42,7 @@ open class PetAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func addPet(body: Pet) -> AnyPublisher { + open func addPet(body: Pet) -> AnyPublisher { let requestBuilder = addPetWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -55,9 +74,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -66,11 +85,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -82,7 +104,7 @@ open class PetAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func deletePet(petId: Int64, apiKey: String? = nil) -> AnyPublisher { + open func deletePet(petId: Int64, apiKey: String? = nil) -> AnyPublisher { let requestBuilder = deletePetWithRequestBuilder(petId: petId, apiKey: apiKey) let requestTask = requestBuilder.requestTask return Future { promise in @@ -112,12 +134,12 @@ open class PetAPI { - parameter apiKey: (header) (optional) - returns: RequestBuilder */ - open class func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { + open func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -126,11 +148,14 @@ open class PetAPI { "api_key": apiKey?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -150,7 +175,7 @@ open class PetAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func findPetsByStatus(status: [Status_findPetsByStatus]) -> AnyPublisher<[Pet], Error> { + open func findPetsByStatus(status: [Status_findPetsByStatus]) -> AnyPublisher<[Pet], Error> { let requestBuilder = findPetsByStatusWithRequestBuilder(status: status) let requestTask = requestBuilder.requestTask return Future<[Pet], Error> { promise in @@ -180,9 +205,9 @@ open class PetAPI { - parameter status: (query) Status values that need to be considered for filter - returns: RequestBuilder<[Pet]> */ - open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { + open func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -194,11 +219,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -210,7 +238,7 @@ open class PetAPI { #if canImport(Combine) @available(*, deprecated, message: "This operation is deprecated.") @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func findPetsByTags(tags: [String]) -> AnyPublisher<[Pet], Error> { + open func findPetsByTags(tags: [String]) -> AnyPublisher<[Pet], Error> { let requestBuilder = findPetsByTagsWithRequestBuilder(tags: tags) let requestTask = requestBuilder.requestTask return Future<[Pet], Error> { promise in @@ -241,9 +269,9 @@ open class PetAPI { - returns: RequestBuilder<[Pet]> */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { + open func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -255,11 +283,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -270,7 +301,7 @@ open class PetAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func getPetById(petId: Int64) -> AnyPublisher { + open func getPetById(petId: Int64) -> AnyPublisher { let requestBuilder = getPetByIdWithRequestBuilder(petId: petId) let requestTask = requestBuilder.requestTask return Future { promise in @@ -300,12 +331,12 @@ open class PetAPI { - parameter petId: (path) ID of pet to return - returns: RequestBuilder */ - open class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { + open func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -314,11 +345,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -329,7 +363,7 @@ open class PetAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func updatePet(body: Pet) -> AnyPublisher { + open func updatePet(body: Pet) -> AnyPublisher { let requestBuilder = updatePetWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -358,9 +392,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -369,11 +403,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -386,7 +423,7 @@ open class PetAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil) -> AnyPublisher { + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil) -> AnyPublisher { let requestBuilder = updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status) let requestTask = requestBuilder.requestTask return Future { promise in @@ -417,12 +454,12 @@ open class PetAPI { - parameter status: (form) Updated status of the pet (optional) - returns: RequestBuilder */ - open class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { + open func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "name": name?.encodeToJSON(), "status": status?.encodeToJSON(), @@ -437,11 +474,14 @@ open class PetAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -454,7 +494,7 @@ open class PetAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> AnyPublisher { + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> AnyPublisher { let requestBuilder = uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file) let requestTask = requestBuilder.requestTask return Future { promise in @@ -485,12 +525,12 @@ open class PetAPI { - parameter file: (form) file to upload (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { + open func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}/uploadImage" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "file": file?.encodeToJSON(), @@ -505,11 +545,14 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -522,7 +565,7 @@ open class PetAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> AnyPublisher { + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> AnyPublisher { let requestBuilder = uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) let requestTask = requestBuilder.requestTask return Future { promise in @@ -553,12 +596,12 @@ open class PetAPI { - parameter additionalMetadata: (form) Additional data to pass to server (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { + open func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { var localVariablePath = "/fake/{petId}/uploadImageWithRequiredFile" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "requiredFile": requiredFile.encodeToJSON(), @@ -573,10 +616,13 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index 39a891ae8684..46e783a7409b 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(Combine) import Combine #endif @@ -14,6 +17,22 @@ import AnyCodable #endif open class StoreAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Delete purchase order by ID @@ -23,7 +42,7 @@ open class StoreAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func deleteOrder(orderId: String) -> AnyPublisher { + open func deleteOrder(orderId: String) -> AnyPublisher { let requestBuilder = deleteOrderWithRequestBuilder(orderId: orderId) let requestTask = requestBuilder.requestTask return Future { promise in @@ -50,12 +69,12 @@ open class StoreAPI { - parameter orderId: (path) ID of the order that needs to be deleted - returns: RequestBuilder */ - open class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { + open func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -64,11 +83,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -78,7 +100,7 @@ open class StoreAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func getInventory() -> AnyPublisher<[String: Int], Error> { + open func getInventory() -> AnyPublisher<[String: Int], Error> { let requestBuilder = getInventoryWithRequestBuilder() let requestTask = requestBuilder.requestTask return Future<[String: Int], Error> { promise in @@ -107,9 +129,9 @@ open class StoreAPI { - name: api_key - returns: RequestBuilder<[String: Int]> */ - open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { + open func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -118,11 +140,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -133,7 +158,7 @@ open class StoreAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func getOrderById(orderId: Int64) -> AnyPublisher { + open func getOrderById(orderId: Int64) -> AnyPublisher { let requestBuilder = getOrderByIdWithRequestBuilder(orderId: orderId) let requestTask = requestBuilder.requestTask return Future { promise in @@ -160,12 +185,12 @@ open class StoreAPI { - parameter orderId: (path) ID of pet that needs to be fetched - returns: RequestBuilder */ - open class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { + open func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -174,11 +199,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -189,7 +217,7 @@ open class StoreAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func placeOrder(body: Order) -> AnyPublisher { + open func placeOrder(body: Order) -> AnyPublisher { let requestBuilder = placeOrderWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -215,9 +243,9 @@ open class StoreAPI { - parameter body: (body) order placed for purchasing the pet - returns: RequestBuilder */ - open class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { + open func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { let localVariablePath = "/store/order" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -226,10 +254,13 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index e5797abfc813..5f34bf50e541 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(Combine) import Combine #endif @@ -14,6 +17,22 @@ import AnyCodable #endif open class UserAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Create user @@ -23,7 +42,7 @@ open class UserAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func createUser(body: User) -> AnyPublisher { + open func createUser(body: User) -> AnyPublisher { let requestBuilder = createUserWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -50,9 +69,9 @@ open class UserAPI { - parameter body: (body) Created user object - returns: RequestBuilder */ - open class func createUserWithRequestBuilder(body: User) -> RequestBuilder { + open func createUserWithRequestBuilder(body: User) -> RequestBuilder { let localVariablePath = "/user" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -61,11 +80,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -76,7 +98,7 @@ open class UserAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func createUsersWithArrayInput(body: [User]) -> AnyPublisher { + open func createUsersWithArrayInput(body: [User]) -> AnyPublisher { let requestBuilder = createUsersWithArrayInputWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -102,9 +124,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithArray" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -113,11 +135,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -128,7 +153,7 @@ open class UserAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func createUsersWithListInput(body: [User]) -> AnyPublisher { + open func createUsersWithListInput(body: [User]) -> AnyPublisher { let requestBuilder = createUsersWithListInputWithRequestBuilder(body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -154,9 +179,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithList" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -165,11 +190,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -180,7 +208,7 @@ open class UserAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func deleteUser(username: String) -> AnyPublisher { + open func deleteUser(username: String) -> AnyPublisher { let requestBuilder = deleteUserWithRequestBuilder(username: username) let requestTask = requestBuilder.requestTask return Future { promise in @@ -207,12 +235,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be deleted - returns: RequestBuilder */ - open class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { + open func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -221,11 +249,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -236,7 +267,7 @@ open class UserAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func getUserByName(username: String) -> AnyPublisher { + open func getUserByName(username: String) -> AnyPublisher { let requestBuilder = getUserByNameWithRequestBuilder(username: username) let requestTask = requestBuilder.requestTask return Future { promise in @@ -262,12 +293,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: RequestBuilder */ - open class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { + open func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -276,11 +307,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -292,7 +326,7 @@ open class UserAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func loginUser(username: String, password: String) -> AnyPublisher { + open func loginUser(username: String, password: String) -> AnyPublisher { let requestBuilder = loginUserWithRequestBuilder(username: username, password: password) let requestTask = requestBuilder.requestTask return Future { promise in @@ -320,9 +354,9 @@ open class UserAPI { - parameter password: (query) The password for login in clear text - returns: RequestBuilder */ - open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { + open func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { let localVariablePath = "/user/login" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -335,11 +369,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -349,7 +386,7 @@ open class UserAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func logoutUser() -> AnyPublisher { + open func logoutUser() -> AnyPublisher { let requestBuilder = logoutUserWithRequestBuilder() let requestTask = requestBuilder.requestTask return Future { promise in @@ -374,9 +411,9 @@ open class UserAPI { - GET /user/logout - returns: RequestBuilder */ - open class func logoutUserWithRequestBuilder() -> RequestBuilder { + open func logoutUserWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/user/logout" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -385,11 +422,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -401,7 +441,7 @@ open class UserAPI { */ #if canImport(Combine) @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) - open class func updateUser(username: String, body: User) -> AnyPublisher { + open func updateUser(username: String, body: User) -> AnyPublisher { let requestBuilder = updateUserWithRequestBuilder(username: username, body: body) let requestTask = requestBuilder.requestTask return Future { promise in @@ -429,12 +469,12 @@ open class UserAPI { - parameter body: (body) Updated user object - returns: RequestBuilder */ - open class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { + open func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -443,10 +483,13 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 6fa4d0e20eb9..3f3e8894c3d6 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -71,8 +71,8 @@ open class URLSessionRequestBuilder: RequestBuilder { */ public var taskDidReceiveChallenge: PetstoreClientAPIChallengeHandler? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/combineLibrary/docs/AnotherFakeAPI.md b/samples/client/petstore/swift5/combineLibrary/docs/AnotherFakeAPI.md index 26346e81a4cb..47c30277fb98 100644 --- a/samples/client/petstore/swift5/combineLibrary/docs/AnotherFakeAPI.md +++ b/samples/client/petstore/swift5/combineLibrary/docs/AnotherFakeAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **call123testSpecialTags** ```swift - open class func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test special tags @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test special tags -AnotherFakeAPI.call123testSpecialTags(body: body) { (response, error) in +AnotherFakeAPI().call123testSpecialTags(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/combineLibrary/docs/FakeAPI.md b/samples/client/petstore/swift5/combineLibrary/docs/FakeAPI.md index 69b1faa2b991..9df703b7b5d2 100644 --- a/samples/client/petstore/swift5/combineLibrary/docs/FakeAPI.md +++ b/samples/client/petstore/swift5/combineLibrary/docs/FakeAPI.md @@ -20,7 +20,7 @@ Method | HTTP request | Description # **fakeOuterBooleanSerialize** ```swift - open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) + open func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) ``` @@ -34,7 +34,7 @@ import PetstoreClient let body = true // Bool | Input boolean as post body (optional) -FakeAPI.fakeOuterBooleanSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterBooleanSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -69,7 +69,7 @@ No authorization required # **fakeOuterCompositeSerialize** ```swift - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) ``` @@ -83,7 +83,7 @@ import PetstoreClient let body = OuterComposite(myNumber: 123, myString: "myString_example", myBoolean: false) // OuterComposite | Input composite as post body (optional) -FakeAPI.fakeOuterCompositeSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterCompositeSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -118,7 +118,7 @@ No authorization required # **fakeOuterNumberSerialize** ```swift - open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) + open func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) ``` @@ -132,7 +132,7 @@ import PetstoreClient let body = 987 // Double | Input number as post body (optional) -FakeAPI.fakeOuterNumberSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterNumberSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -167,7 +167,7 @@ No authorization required # **fakeOuterStringSerialize** ```swift - open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` @@ -181,7 +181,7 @@ import PetstoreClient let body = "body_example" // String | Input string as post body (optional) -FakeAPI.fakeOuterStringSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterStringSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -216,7 +216,7 @@ No authorization required # **testBodyWithFileSchema** ```swift - open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -230,7 +230,7 @@ import PetstoreClient let body = FileSchemaTestClass(file: File(sourceURI: "sourceURI_example"), files: [nil]) // FileSchemaTestClass | -FakeAPI.testBodyWithFileSchema(body: body) { (response, error) in +FakeAPI().testBodyWithFileSchema(body: body) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ No authorization required # **testBodyWithQueryParams** ```swift - open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -278,7 +278,7 @@ import PetstoreClient let query = "query_example" // String | let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | -FakeAPI.testBodyWithQueryParams(query: query, body: body) { (response, error) in +FakeAPI().testBodyWithQueryParams(query: query, body: body) { (response, error) in guard error == nil else { print(error) return @@ -314,7 +314,7 @@ No authorization required # **testClientModel** ```swift - open class func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test \"client\" model @@ -329,7 +329,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test \"client\" model -FakeAPI.testClientModel(body: body) { (response, error) in +FakeAPI().testClientModel(body: body) { (response, error) in guard error == nil else { print(error) return @@ -364,7 +364,7 @@ No authorization required # **testEndpointParameters** ```swift - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -392,7 +392,7 @@ let password = "password_example" // String | None (optional) let callback = "callback_example" // String | None (optional) // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 -FakeAPI.testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in +FakeAPI().testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in guard error == nil else { print(error) return @@ -440,7 +440,7 @@ Void (empty response body) # **testEnumParameters** ```swift - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` To test enum parameters @@ -462,7 +462,7 @@ let enumFormStringArray = ["inner_example"] // [String] | Form parameter enum te let enumFormString = "enumFormString_example" // String | Form parameter enum test (string) (optional) (default to .efg) // To test enum parameters -FakeAPI.testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in +FakeAPI().testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in guard error == nil else { print(error) return @@ -504,7 +504,7 @@ No authorization required # **testGroupParameters** ```swift - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint to test group parameters (optional) @@ -524,7 +524,7 @@ let booleanGroup = true // Bool | Boolean in group parameters (optional) let int64Group = 987 // Int64 | Integer in group parameters (optional) // Fake endpoint to test group parameters (optional) -FakeAPI.testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in +FakeAPI().testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in guard error == nil else { print(error) return @@ -564,7 +564,7 @@ No authorization required # **testInlineAdditionalProperties** ```swift - open class func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test inline additionalProperties @@ -577,7 +577,7 @@ import PetstoreClient let param = "TODO" // [String: String] | request body // test inline additionalProperties -FakeAPI.testInlineAdditionalProperties(param: param) { (response, error) in +FakeAPI().testInlineAdditionalProperties(param: param) { (response, error) in guard error == nil else { print(error) return @@ -612,7 +612,7 @@ No authorization required # **testJsonFormData** ```swift - open class func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test json serialization of form data @@ -626,7 +626,7 @@ let param = "param_example" // String | field1 let param2 = "param2_example" // String | field2 // test json serialization of form data -FakeAPI.testJsonFormData(param: param, param2: param2) { (response, error) in +FakeAPI().testJsonFormData(param: param, param2: param2) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/combineLibrary/docs/FakeClassnameTags123API.md b/samples/client/petstore/swift5/combineLibrary/docs/FakeClassnameTags123API.md index 5b9b66073fe0..7ef18c9cc1d5 100644 --- a/samples/client/petstore/swift5/combineLibrary/docs/FakeClassnameTags123API.md +++ b/samples/client/petstore/swift5/combineLibrary/docs/FakeClassnameTags123API.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **testClassname** ```swift - open class func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test class name in snake case @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test class name in snake case -FakeClassnameTags123API.testClassname(body: body) { (response, error) in +FakeClassnameTags123API().testClassname(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/combineLibrary/docs/PetAPI.md b/samples/client/petstore/swift5/combineLibrary/docs/PetAPI.md index e6219c37c4ec..12cd425b07b8 100644 --- a/samples/client/petstore/swift5/combineLibrary/docs/PetAPI.md +++ b/samples/client/petstore/swift5/combineLibrary/docs/PetAPI.md @@ -17,7 +17,7 @@ Method | HTTP request | Description # **addPet** ```swift - open class func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Add a new pet to the store @@ -30,7 +30,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Add a new pet to the store -PetAPI.addPet(body: body) { (response, error) in +PetAPI().addPet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -65,7 +65,7 @@ Void (empty response body) # **deletePet** ```swift - open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Deletes a pet @@ -79,7 +79,7 @@ let petId = 987 // Int64 | Pet id to delete let apiKey = "apiKey_example" // String | (optional) // Deletes a pet -PetAPI.deletePet(petId: petId, apiKey: apiKey) { (response, error) in +PetAPI().deletePet(petId: petId, apiKey: apiKey) { (response, error) in guard error == nil else { print(error) return @@ -115,7 +115,7 @@ Void (empty response body) # **findPetsByStatus** ```swift - open class func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + open func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by status @@ -130,7 +130,7 @@ import PetstoreClient let status = ["status_example"] // [String] | Status values that need to be considered for filter // Finds Pets by status -PetAPI.findPetsByStatus(status: status) { (response, error) in +PetAPI().findPetsByStatus(status: status) { (response, error) in guard error == nil else { print(error) return @@ -165,7 +165,7 @@ Name | Type | Description | Notes # **findPetsByTags** ```swift - open class func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + open func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by tags @@ -180,7 +180,7 @@ import PetstoreClient let tags = ["inner_example"] // [String] | Tags to filter by // Finds Pets by tags -PetAPI.findPetsByTags(tags: tags) { (response, error) in +PetAPI().findPetsByTags(tags: tags) { (response, error) in guard error == nil else { print(error) return @@ -215,7 +215,7 @@ Name | Type | Description | Notes # **getPetById** ```swift - open class func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) + open func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) ``` Find pet by ID @@ -230,7 +230,7 @@ import PetstoreClient let petId = 987 // Int64 | ID of pet to return // Find pet by ID -PetAPI.getPetById(petId: petId) { (response, error) in +PetAPI().getPetById(petId: petId) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ Name | Type | Description | Notes # **updatePet** ```swift - open class func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Update an existing pet @@ -278,7 +278,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Update an existing pet -PetAPI.updatePet(body: body) { (response, error) in +PetAPI().updatePet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -313,7 +313,7 @@ Void (empty response body) # **updatePetWithForm** ```swift - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updates a pet in the store with form data @@ -328,7 +328,7 @@ let name = "name_example" // String | Updated name of the pet (optional) let status = "status_example" // String | Updated status of the pet (optional) // Updates a pet in the store with form data -PetAPI.updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in +PetAPI().updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in guard error == nil else { print(error) return @@ -365,7 +365,7 @@ Void (empty response body) # **uploadFile** ```swift - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image @@ -380,7 +380,7 @@ let additionalMetadata = "additionalMetadata_example" // String | Additional dat let file = URL(string: "https://example.com")! // URL | file to upload (optional) // uploads an image -PetAPI.uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in +PetAPI().uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in guard error == nil else { print(error) return @@ -417,7 +417,7 @@ Name | Type | Description | Notes # **uploadFileWithRequiredFile** ```swift - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image (required) @@ -432,7 +432,7 @@ let requiredFile = URL(string: "https://example.com")! // URL | file to upload let additionalMetadata = "additionalMetadata_example" // String | Additional data to pass to server (optional) // uploads an image (required) -PetAPI.uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in +PetAPI().uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/combineLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/combineLibrary/docs/StoreAPI.md index edb75e33b70b..3375f6ac5c73 100644 --- a/samples/client/petstore/swift5/combineLibrary/docs/StoreAPI.md +++ b/samples/client/petstore/swift5/combineLibrary/docs/StoreAPI.md @@ -12,7 +12,7 @@ Method | HTTP request | Description # **deleteOrder** ```swift - open class func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete purchase order by ID @@ -27,7 +27,7 @@ import PetstoreClient let orderId = "orderId_example" // String | ID of the order that needs to be deleted // Delete purchase order by ID -StoreAPI.deleteOrder(orderId: orderId) { (response, error) in +StoreAPI().deleteOrder(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -62,7 +62,7 @@ No authorization required # **getInventory** ```swift - open class func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) + open func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) ``` Returns pet inventories by status @@ -76,7 +76,7 @@ import PetstoreClient // Returns pet inventories by status -StoreAPI.getInventory() { (response, error) in +StoreAPI().getInventory() { (response, error) in guard error == nil else { print(error) return @@ -108,7 +108,7 @@ This endpoint does not need any parameter. # **getOrderById** ```swift - open class func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Find purchase order by ID @@ -123,7 +123,7 @@ import PetstoreClient let orderId = 987 // Int64 | ID of pet that needs to be fetched // Find purchase order by ID -StoreAPI.getOrderById(orderId: orderId) { (response, error) in +StoreAPI().getOrderById(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -158,7 +158,7 @@ No authorization required # **placeOrder** ```swift - open class func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Place an order for a pet @@ -171,7 +171,7 @@ import PetstoreClient let body = Order(id: 123, petId: 123, quantity: 123, shipDate: Date(), status: "status_example", complete: false) // Order | order placed for purchasing the pet // Place an order for a pet -StoreAPI.placeOrder(body: body) { (response, error) in +StoreAPI().placeOrder(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/combineLibrary/docs/UserAPI.md b/samples/client/petstore/swift5/combineLibrary/docs/UserAPI.md index 5fc9160daf47..54ad86b31144 100644 --- a/samples/client/petstore/swift5/combineLibrary/docs/UserAPI.md +++ b/samples/client/petstore/swift5/combineLibrary/docs/UserAPI.md @@ -16,7 +16,7 @@ Method | HTTP request | Description # **createUser** ```swift - open class func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Create user @@ -31,7 +31,7 @@ import PetstoreClient let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Created user object // Create user -UserAPI.createUser(body: body) { (response, error) in +UserAPI().createUser(body: body) { (response, error) in guard error == nil else { print(error) return @@ -66,7 +66,7 @@ No authorization required # **createUsersWithArrayInput** ```swift - open class func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -79,7 +79,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithArrayInput(body: body) { (response, error) in +UserAPI().createUsersWithArrayInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -114,7 +114,7 @@ No authorization required # **createUsersWithListInput** ```swift - open class func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -127,7 +127,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithListInput(body: body) { (response, error) in +UserAPI().createUsersWithListInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -162,7 +162,7 @@ No authorization required # **deleteUser** ```swift - open class func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete user @@ -177,7 +177,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be deleted // Delete user -UserAPI.deleteUser(username: username) { (response, error) in +UserAPI().deleteUser(username: username) { (response, error) in guard error == nil else { print(error) return @@ -212,7 +212,7 @@ No authorization required # **getUserByName** ```swift - open class func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) + open func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) ``` Get user by user name @@ -225,7 +225,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be fetched. Use user1 for testing. // Get user by user name -UserAPI.getUserByName(username: username) { (response, error) in +UserAPI().getUserByName(username: username) { (response, error) in guard error == nil else { print(error) return @@ -260,7 +260,7 @@ No authorization required # **loginUser** ```swift - open class func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` Logs user into the system @@ -274,7 +274,7 @@ let username = "username_example" // String | The user name for login let password = "password_example" // String | The password for login in clear text // Logs user into the system -UserAPI.loginUser(username: username, password: password) { (response, error) in +UserAPI().loginUser(username: username, password: password) { (response, error) in guard error == nil else { print(error) return @@ -310,7 +310,7 @@ No authorization required # **logoutUser** ```swift - open class func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Logs out current logged in user session @@ -322,7 +322,7 @@ import PetstoreClient // Logs out current logged in user session -UserAPI.logoutUser() { (response, error) in +UserAPI().logoutUser() { (response, error) in guard error == nil else { print(error) return @@ -354,7 +354,7 @@ No authorization required # **updateUser** ```swift - open class func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updated user @@ -370,7 +370,7 @@ let username = "username_example" // String | name that need to be deleted let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Updated user object // Updated user -UserAPI.updateUser(username: username, body: body) { (response, error) in +UserAPI().updateUser(username: username, body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3ad11a871d5a..49426a6f123a 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -28,15 +28,13 @@ open class RequestBuilder { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders(PetstoreClientAPI.customHeaders) - addCredential() + self.credential = credential } open func addHeaders(_ aHeaders: [String: String]) { @@ -57,8 +55,8 @@ open class RequestBuilder { return self } - open func addCredential() { - credential = PetstoreClientAPI.credential + open func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index d7d6146e3566..a5f05cf9813b 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class AnotherFakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test special tags @@ -21,7 +40,7 @@ open class AnotherFakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func call123testSpecialTags(uuidTest: UUID, body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func call123testSpecialTags(uuidTest: UUID, body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return call123testSpecialTagsWithRequestBuilder(uuidTest: uuidTest, body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -40,9 +59,9 @@ open class AnotherFakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func call123testSpecialTagsWithRequestBuilder(uuidTest: UUID, body: Client) -> RequestBuilder { + open func call123testSpecialTagsWithRequestBuilder(uuidTest: UUID, body: Client) -> RequestBuilder { let localVariablePath = "/another-fake/dummy" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -52,10 +71,13 @@ open class AnotherFakeAPI { "uuid_test": uuidTest.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index 1a5d74a29efc..eb97542cd34f 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class FakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** creates an XmlItem @@ -20,7 +39,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createXmlItem(xmlItem: XmlItem, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createXmlItem(xmlItem: XmlItem, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createXmlItemWithRequestBuilder(xmlItem: xmlItem).execute(apiResponseQueue) { result in switch result { case .success: @@ -38,9 +57,9 @@ open class FakeAPI { - parameter xmlItem: (body) XmlItem Body - returns: RequestBuilder */ - open class func createXmlItemWithRequestBuilder(xmlItem: XmlItem) -> RequestBuilder { + open func createXmlItemWithRequestBuilder(xmlItem: XmlItem) -> RequestBuilder { let localVariablePath = "/fake/create_xml_item" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: xmlItem) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -49,11 +68,14 @@ open class FakeAPI { "Content-Type": "application/xml", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -63,7 +85,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -80,9 +102,9 @@ open class FakeAPI { - parameter body: (body) Input boolean as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { + open func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/boolean" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -91,11 +113,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -105,7 +130,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -122,9 +147,9 @@ open class FakeAPI { - parameter body: (body) Input composite as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { + open func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/composite" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -133,11 +158,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -147,7 +175,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -164,9 +192,9 @@ open class FakeAPI { - parameter body: (body) Input number as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { + open func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/number" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -175,11 +203,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -189,7 +220,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -206,9 +237,9 @@ open class FakeAPI { - parameter body: (body) Input string as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { + open func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/string" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -217,11 +248,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -231,7 +265,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -248,9 +282,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { + open func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { let localVariablePath = "/fake/body-with-file-schema" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -259,11 +293,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -274,7 +311,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -291,9 +328,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { + open func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { let localVariablePath = "/fake/body-with-query-params" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -305,11 +342,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -320,7 +360,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -338,9 +378,9 @@ open class FakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -349,11 +389,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -377,7 +420,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result in switch result { case .success: @@ -411,9 +454,9 @@ open class FakeAPI { - parameter callback: (form) None (optional) - returns: RequestBuilder */ - open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { + open func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "integer": integer?.encodeToJSON(), "int32": int32?.encodeToJSON(), @@ -440,11 +483,14 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -529,7 +575,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result in switch result { case .success: @@ -554,9 +600,9 @@ open class FakeAPI { - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: RequestBuilder */ - open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { + open func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "enum_form_string_array": enumFormStringArray?.encodeToJSON(), "enum_form_string": enumFormString?.encodeToJSON(), @@ -579,11 +625,14 @@ open class FakeAPI { "enum_header_string": enumHeaderString?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -599,7 +648,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result in switch result { case .success: @@ -622,9 +671,9 @@ open class FakeAPI { - parameter int64Group: (query) Integer in group parameters (optional) - returns: RequestBuilder */ - open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { + open func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -640,11 +689,14 @@ open class FakeAPI { "boolean_group": booleanGroup?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -655,7 +707,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result in switch result { case .success: @@ -672,9 +724,9 @@ open class FakeAPI { - parameter param: (body) request body - returns: RequestBuilder */ - open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { + open func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { let localVariablePath = "/fake/inline-additionalProperties" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -683,11 +735,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -699,7 +754,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result in switch result { case .success: @@ -717,9 +772,9 @@ open class FakeAPI { - parameter param2: (form) field2 - returns: RequestBuilder */ - open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { + open func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "param": param.encodeToJSON(), "param2": param2.encodeToJSON(), @@ -734,11 +789,14 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -752,7 +810,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testQueryParameterCollectionFormat(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testQueryParameterCollectionFormat(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testQueryParameterCollectionFormatWithRequestBuilder(pipe: pipe, ioutil: ioutil, http: http, url: url, context: context).execute(apiResponseQueue) { result in switch result { case .success: @@ -773,9 +831,9 @@ open class FakeAPI { - parameter context: (query) - returns: RequestBuilder */ - open class func testQueryParameterCollectionFormatWithRequestBuilder(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String]) -> RequestBuilder { + open func testQueryParameterCollectionFormatWithRequestBuilder(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String]) -> RequestBuilder { let localVariablePath = "/fake/test-query-parameters" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -791,10 +849,13 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index d70cffdbdde7..45a52bd3da68 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class FakeClassnameTags123API { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test class name in snake case @@ -20,7 +39,7 @@ open class FakeClassnameTags123API { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -41,9 +60,9 @@ open class FakeClassnameTags123API { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake_classname_test" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -52,10 +71,13 @@ open class FakeClassnameTags123API { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index 9d32596ac814..21b94efbd03a 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class PetAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Add a new pet to the store @@ -20,7 +39,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -40,9 +59,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -51,11 +70,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -67,7 +89,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result in switch result { case .success: @@ -88,12 +110,12 @@ open class PetAPI { - parameter apiKey: (header) (optional) - returns: RequestBuilder */ - open class func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { + open func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -102,11 +124,14 @@ open class PetAPI { "api_key": apiKey?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -126,7 +151,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { + open func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { return findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -147,9 +172,9 @@ open class PetAPI { - parameter status: (query) Status values that need to be considered for filter - returns: RequestBuilder<[Pet]> */ - open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { + open func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -161,11 +186,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -177,7 +205,7 @@ open class PetAPI { */ @available(*, deprecated, message: "This operation is deprecated.") @discardableResult - open class func findPetsByTags(tags: Set, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Set?, _ error: Error?) -> Void)) -> RequestTask { + open func findPetsByTags(tags: Set, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Set?, _ error: Error?) -> Void)) -> RequestTask { return findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -199,9 +227,9 @@ open class PetAPI { - returns: RequestBuilder> */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTagsWithRequestBuilder(tags: Set) -> RequestBuilder> { + open func findPetsByTagsWithRequestBuilder(tags: Set) -> RequestBuilder> { let localVariablePath = "/pet/findByTags" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -213,11 +241,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -228,7 +259,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) -> RequestTask { + open func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) -> RequestTask { return getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -249,12 +280,12 @@ open class PetAPI { - parameter petId: (path) ID of pet to return - returns: RequestBuilder */ - open class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { + open func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -263,11 +294,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -278,7 +312,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -298,9 +332,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -309,11 +343,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -326,7 +363,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result in switch result { case .success: @@ -348,12 +385,12 @@ open class PetAPI { - parameter status: (form) Updated status of the pet (optional) - returns: RequestBuilder */ - open class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { + open func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "name": name?.encodeToJSON(), "status": status?.encodeToJSON(), @@ -368,11 +405,14 @@ open class PetAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -385,7 +425,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { return uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -407,12 +447,12 @@ open class PetAPI { - parameter file: (form) file to upload (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { + open func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}/uploadImage" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "file": file?.encodeToJSON(), @@ -427,11 +467,14 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -444,7 +487,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { return uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -466,12 +509,12 @@ open class PetAPI { - parameter additionalMetadata: (form) Additional data to pass to server (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { + open func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { var localVariablePath = "/fake/{petId}/uploadImageWithRequiredFile" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "requiredFile": requiredFile.encodeToJSON(), @@ -486,10 +529,13 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index ad60d97fa921..4712a26fb5d6 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class StoreAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Delete purchase order by ID @@ -20,7 +39,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case .success: @@ -38,12 +57,12 @@ open class StoreAPI { - parameter orderId: (path) ID of the order that needs to be deleted - returns: RequestBuilder */ - open class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { + open func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -52,11 +71,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -66,7 +88,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) -> RequestTask { + open func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) -> RequestTask { return getInventoryWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -86,9 +108,9 @@ open class StoreAPI { - name: api_key - returns: RequestBuilder<[String: Int]> */ - open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { + open func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -97,11 +119,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -112,7 +137,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { + open func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { return getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -130,12 +155,12 @@ open class StoreAPI { - parameter orderId: (path) ID of pet that needs to be fetched - returns: RequestBuilder */ - open class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { + open func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -144,11 +169,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -159,7 +187,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { + open func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { return placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -176,9 +204,9 @@ open class StoreAPI { - parameter body: (body) order placed for purchasing the pet - returns: RequestBuilder */ - open class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { + open func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { let localVariablePath = "/store/order" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -187,10 +215,13 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index 5072c1f1daea..937539aa1e9b 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class UserAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Create user @@ -20,7 +39,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -38,9 +57,9 @@ open class UserAPI { - parameter body: (body) Created user object - returns: RequestBuilder */ - open class func createUserWithRequestBuilder(body: User) -> RequestBuilder { + open func createUserWithRequestBuilder(body: User) -> RequestBuilder { let localVariablePath = "/user" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -49,11 +68,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -64,7 +86,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -81,9 +103,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithArray" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -92,11 +114,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -107,7 +132,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -124,9 +149,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithList" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -135,11 +160,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -150,7 +178,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case .success: @@ -168,12 +196,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be deleted - returns: RequestBuilder */ - open class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { + open func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -182,11 +210,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -197,7 +228,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) -> RequestTask { + open func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) -> RequestTask { return getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -214,12 +245,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: RequestBuilder */ - open class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { + open func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -228,11 +259,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -244,7 +278,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { + open func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { return loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -263,9 +297,9 @@ open class UserAPI { - parameter password: (query) The password for login in clear text - returns: RequestBuilder */ - open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { + open func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { let localVariablePath = "/user/login" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -278,11 +312,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -292,7 +329,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return logoutUserWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case .success: @@ -308,9 +345,9 @@ open class UserAPI { - GET /user/logout - returns: RequestBuilder */ - open class func logoutUserWithRequestBuilder() -> RequestBuilder { + open func logoutUserWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/user/logout" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -319,11 +356,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -335,7 +375,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -354,12 +394,12 @@ open class UserAPI { - parameter body: (body) Updated user object - returns: RequestBuilder */ - open class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { + open func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -368,10 +408,13 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 6fa4d0e20eb9..3f3e8894c3d6 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -71,8 +71,8 @@ open class URLSessionRequestBuilder: RequestBuilder { */ public var taskDidReceiveChallenge: PetstoreClientAPIChallengeHandler? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/default/docs/AnotherFakeAPI.md b/samples/client/petstore/swift5/default/docs/AnotherFakeAPI.md index ce8a5b9886ca..f2742993db7b 100644 --- a/samples/client/petstore/swift5/default/docs/AnotherFakeAPI.md +++ b/samples/client/petstore/swift5/default/docs/AnotherFakeAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **call123testSpecialTags** ```swift - open class func call123testSpecialTags(uuidTest: UUID, body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func call123testSpecialTags(uuidTest: UUID, body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test special tags @@ -25,7 +25,7 @@ let uuidTest = 987 // UUID | to test uuid example value let body = Client(client: "client_example") // Client | client model // To test special tags -AnotherFakeAPI.call123testSpecialTags(uuidTest: uuidTest, body: body) { (response, error) in +AnotherFakeAPI().call123testSpecialTags(uuidTest: uuidTest, body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/default/docs/FakeAPI.md b/samples/client/petstore/swift5/default/docs/FakeAPI.md index 5004221689ee..a7fabf80bc41 100644 --- a/samples/client/petstore/swift5/default/docs/FakeAPI.md +++ b/samples/client/petstore/swift5/default/docs/FakeAPI.md @@ -22,7 +22,7 @@ Method | HTTP request | Description # **createXmlItem** ```swift - open class func createXmlItem(xmlItem: XmlItem, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createXmlItem(xmlItem: XmlItem, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` creates an XmlItem @@ -37,7 +37,7 @@ import PetstoreClient let xmlItem = XmlItem(attributeString: "attributeString_example", attributeNumber: 123, attributeInteger: 123, attributeBoolean: true, wrappedArray: [123], nameString: "nameString_example", nameNumber: 123, nameInteger: 123, nameBoolean: true, nameArray: [123], nameWrappedArray: [123], prefixString: "prefixString_example", prefixNumber: 123, prefixInteger: 123, prefixBoolean: true, prefixArray: [123], prefixWrappedArray: [123], namespaceString: "namespaceString_example", namespaceNumber: 123, namespaceInteger: 123, namespaceBoolean: true, namespaceArray: [123], namespaceWrappedArray: [123], prefixNsString: "prefixNsString_example", prefixNsNumber: 123, prefixNsInteger: 123, prefixNsBoolean: true, prefixNsArray: [123], prefixNsWrappedArray: [123]) // XmlItem | XmlItem Body // creates an XmlItem -FakeAPI.createXmlItem(xmlItem: xmlItem) { (response, error) in +FakeAPI().createXmlItem(xmlItem: xmlItem) { (response, error) in guard error == nil else { print(error) return @@ -72,7 +72,7 @@ No authorization required # **fakeOuterBooleanSerialize** ```swift - open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) + open func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) ``` @@ -86,7 +86,7 @@ import PetstoreClient let body = true // Bool | Input boolean as post body (optional) -FakeAPI.fakeOuterBooleanSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterBooleanSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -121,7 +121,7 @@ No authorization required # **fakeOuterCompositeSerialize** ```swift - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) ``` @@ -135,7 +135,7 @@ import PetstoreClient let body = OuterComposite(myNumber: 123, myString: "myString_example", myBoolean: false) // OuterComposite | Input composite as post body (optional) -FakeAPI.fakeOuterCompositeSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterCompositeSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -170,7 +170,7 @@ No authorization required # **fakeOuterNumberSerialize** ```swift - open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) + open func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) ``` @@ -184,7 +184,7 @@ import PetstoreClient let body = 987 // Double | Input number as post body (optional) -FakeAPI.fakeOuterNumberSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterNumberSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -219,7 +219,7 @@ No authorization required # **fakeOuterStringSerialize** ```swift - open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` @@ -233,7 +233,7 @@ import PetstoreClient let body = "body_example" // String | Input string as post body (optional) -FakeAPI.fakeOuterStringSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterStringSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -268,7 +268,7 @@ No authorization required # **testBodyWithFileSchema** ```swift - open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -282,7 +282,7 @@ import PetstoreClient let body = FileSchemaTestClass(file: File(sourceURI: "sourceURI_example"), files: [nil]) // FileSchemaTestClass | -FakeAPI.testBodyWithFileSchema(body: body) { (response, error) in +FakeAPI().testBodyWithFileSchema(body: body) { (response, error) in guard error == nil else { print(error) return @@ -317,7 +317,7 @@ No authorization required # **testBodyWithQueryParams** ```swift - open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -330,7 +330,7 @@ import PetstoreClient let query = "query_example" // String | let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | -FakeAPI.testBodyWithQueryParams(query: query, body: body) { (response, error) in +FakeAPI().testBodyWithQueryParams(query: query, body: body) { (response, error) in guard error == nil else { print(error) return @@ -366,7 +366,7 @@ No authorization required # **testClientModel** ```swift - open class func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test \"client\" model @@ -381,7 +381,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test \"client\" model -FakeAPI.testClientModel(body: body) { (response, error) in +FakeAPI().testClientModel(body: body) { (response, error) in guard error == nil else { print(error) return @@ -416,7 +416,7 @@ No authorization required # **testEndpointParameters** ```swift - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -444,7 +444,7 @@ let password = "password_example" // String | None (optional) let callback = "callback_example" // String | None (optional) // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 -FakeAPI.testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in +FakeAPI().testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in guard error == nil else { print(error) return @@ -492,7 +492,7 @@ Void (empty response body) # **testEnumParameters** ```swift - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` To test enum parameters @@ -514,7 +514,7 @@ let enumFormStringArray = ["inner_example"] // [String] | Form parameter enum te let enumFormString = "enumFormString_example" // String | Form parameter enum test (string) (optional) (default to .efg) // To test enum parameters -FakeAPI.testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in +FakeAPI().testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in guard error == nil else { print(error) return @@ -556,7 +556,7 @@ No authorization required # **testGroupParameters** ```swift - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint to test group parameters (optional) @@ -576,7 +576,7 @@ let booleanGroup = true // Bool | Boolean in group parameters (optional) let int64Group = 987 // Int64 | Integer in group parameters (optional) // Fake endpoint to test group parameters (optional) -FakeAPI.testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in +FakeAPI().testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in guard error == nil else { print(error) return @@ -616,7 +616,7 @@ No authorization required # **testInlineAdditionalProperties** ```swift - open class func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test inline additionalProperties @@ -629,7 +629,7 @@ import PetstoreClient let param = "TODO" // [String: String] | request body // test inline additionalProperties -FakeAPI.testInlineAdditionalProperties(param: param) { (response, error) in +FakeAPI().testInlineAdditionalProperties(param: param) { (response, error) in guard error == nil else { print(error) return @@ -664,7 +664,7 @@ No authorization required # **testJsonFormData** ```swift - open class func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test json serialization of form data @@ -678,7 +678,7 @@ let param = "param_example" // String | field1 let param2 = "param2_example" // String | field2 // test json serialization of form data -FakeAPI.testJsonFormData(param: param, param2: param2) { (response, error) in +FakeAPI().testJsonFormData(param: param, param2: param2) { (response, error) in guard error == nil else { print(error) return @@ -714,7 +714,7 @@ No authorization required # **testQueryParameterCollectionFormat** ```swift - open class func testQueryParameterCollectionFormat(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testQueryParameterCollectionFormat(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -732,7 +732,7 @@ let http = ["inner_example"] // [String] | let url = ["inner_example"] // [String] | let context = ["inner_example"] // [String] | -FakeAPI.testQueryParameterCollectionFormat(pipe: pipe, ioutil: ioutil, http: http, url: url, context: context) { (response, error) in +FakeAPI().testQueryParameterCollectionFormat(pipe: pipe, ioutil: ioutil, http: http, url: url, context: context) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/default/docs/FakeClassnameTags123API.md b/samples/client/petstore/swift5/default/docs/FakeClassnameTags123API.md index 5b9b66073fe0..7ef18c9cc1d5 100644 --- a/samples/client/petstore/swift5/default/docs/FakeClassnameTags123API.md +++ b/samples/client/petstore/swift5/default/docs/FakeClassnameTags123API.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **testClassname** ```swift - open class func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test class name in snake case @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test class name in snake case -FakeClassnameTags123API.testClassname(body: body) { (response, error) in +FakeClassnameTags123API().testClassname(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/default/docs/PetAPI.md b/samples/client/petstore/swift5/default/docs/PetAPI.md index ee837e6f8af2..54eb17228d27 100644 --- a/samples/client/petstore/swift5/default/docs/PetAPI.md +++ b/samples/client/petstore/swift5/default/docs/PetAPI.md @@ -17,7 +17,7 @@ Method | HTTP request | Description # **addPet** ```swift - open class func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Add a new pet to the store @@ -30,7 +30,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Add a new pet to the store -PetAPI.addPet(body: body) { (response, error) in +PetAPI().addPet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -65,7 +65,7 @@ Void (empty response body) # **deletePet** ```swift - open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Deletes a pet @@ -79,7 +79,7 @@ let petId = 987 // Int64 | Pet id to delete let apiKey = "apiKey_example" // String | (optional) // Deletes a pet -PetAPI.deletePet(petId: petId, apiKey: apiKey) { (response, error) in +PetAPI().deletePet(petId: petId, apiKey: apiKey) { (response, error) in guard error == nil else { print(error) return @@ -115,7 +115,7 @@ Void (empty response body) # **findPetsByStatus** ```swift - open class func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + open func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by status @@ -130,7 +130,7 @@ import PetstoreClient let status = ["status_example"] // [String] | Status values that need to be considered for filter // Finds Pets by status -PetAPI.findPetsByStatus(status: status) { (response, error) in +PetAPI().findPetsByStatus(status: status) { (response, error) in guard error == nil else { print(error) return @@ -165,7 +165,7 @@ Name | Type | Description | Notes # **findPetsByTags** ```swift - open class func findPetsByTags(tags: Set, completion: @escaping (_ data: Set?, _ error: Error?) -> Void) + open func findPetsByTags(tags: Set, completion: @escaping (_ data: Set?, _ error: Error?) -> Void) ``` Finds Pets by tags @@ -180,7 +180,7 @@ import PetstoreClient let tags = ["inner_example"] // Set | Tags to filter by // Finds Pets by tags -PetAPI.findPetsByTags(tags: tags) { (response, error) in +PetAPI().findPetsByTags(tags: tags) { (response, error) in guard error == nil else { print(error) return @@ -215,7 +215,7 @@ Name | Type | Description | Notes # **getPetById** ```swift - open class func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) + open func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) ``` Find pet by ID @@ -230,7 +230,7 @@ import PetstoreClient let petId = 987 // Int64 | ID of pet to return // Find pet by ID -PetAPI.getPetById(petId: petId) { (response, error) in +PetAPI().getPetById(petId: petId) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ Name | Type | Description | Notes # **updatePet** ```swift - open class func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Update an existing pet @@ -278,7 +278,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Update an existing pet -PetAPI.updatePet(body: body) { (response, error) in +PetAPI().updatePet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -313,7 +313,7 @@ Void (empty response body) # **updatePetWithForm** ```swift - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updates a pet in the store with form data @@ -328,7 +328,7 @@ let name = "name_example" // String | Updated name of the pet (optional) let status = "status_example" // String | Updated status of the pet (optional) // Updates a pet in the store with form data -PetAPI.updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in +PetAPI().updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in guard error == nil else { print(error) return @@ -365,7 +365,7 @@ Void (empty response body) # **uploadFile** ```swift - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image @@ -380,7 +380,7 @@ let additionalMetadata = "additionalMetadata_example" // String | Additional dat let file = URL(string: "https://example.com")! // URL | file to upload (optional) // uploads an image -PetAPI.uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in +PetAPI().uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in guard error == nil else { print(error) return @@ -417,7 +417,7 @@ Name | Type | Description | Notes # **uploadFileWithRequiredFile** ```swift - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image (required) @@ -432,7 +432,7 @@ let requiredFile = URL(string: "https://example.com")! // URL | file to upload let additionalMetadata = "additionalMetadata_example" // String | Additional data to pass to server (optional) // uploads an image (required) -PetAPI.uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in +PetAPI().uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/default/docs/StoreAPI.md b/samples/client/petstore/swift5/default/docs/StoreAPI.md index edb75e33b70b..3375f6ac5c73 100644 --- a/samples/client/petstore/swift5/default/docs/StoreAPI.md +++ b/samples/client/petstore/swift5/default/docs/StoreAPI.md @@ -12,7 +12,7 @@ Method | HTTP request | Description # **deleteOrder** ```swift - open class func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete purchase order by ID @@ -27,7 +27,7 @@ import PetstoreClient let orderId = "orderId_example" // String | ID of the order that needs to be deleted // Delete purchase order by ID -StoreAPI.deleteOrder(orderId: orderId) { (response, error) in +StoreAPI().deleteOrder(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -62,7 +62,7 @@ No authorization required # **getInventory** ```swift - open class func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) + open func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) ``` Returns pet inventories by status @@ -76,7 +76,7 @@ import PetstoreClient // Returns pet inventories by status -StoreAPI.getInventory() { (response, error) in +StoreAPI().getInventory() { (response, error) in guard error == nil else { print(error) return @@ -108,7 +108,7 @@ This endpoint does not need any parameter. # **getOrderById** ```swift - open class func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Find purchase order by ID @@ -123,7 +123,7 @@ import PetstoreClient let orderId = 987 // Int64 | ID of pet that needs to be fetched // Find purchase order by ID -StoreAPI.getOrderById(orderId: orderId) { (response, error) in +StoreAPI().getOrderById(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -158,7 +158,7 @@ No authorization required # **placeOrder** ```swift - open class func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Place an order for a pet @@ -171,7 +171,7 @@ import PetstoreClient let body = Order(id: 123, petId: 123, quantity: 123, shipDate: Date(), status: "status_example", complete: false) // Order | order placed for purchasing the pet // Place an order for a pet -StoreAPI.placeOrder(body: body) { (response, error) in +StoreAPI().placeOrder(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/default/docs/UserAPI.md b/samples/client/petstore/swift5/default/docs/UserAPI.md index 5fc9160daf47..54ad86b31144 100644 --- a/samples/client/petstore/swift5/default/docs/UserAPI.md +++ b/samples/client/petstore/swift5/default/docs/UserAPI.md @@ -16,7 +16,7 @@ Method | HTTP request | Description # **createUser** ```swift - open class func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Create user @@ -31,7 +31,7 @@ import PetstoreClient let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Created user object // Create user -UserAPI.createUser(body: body) { (response, error) in +UserAPI().createUser(body: body) { (response, error) in guard error == nil else { print(error) return @@ -66,7 +66,7 @@ No authorization required # **createUsersWithArrayInput** ```swift - open class func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -79,7 +79,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithArrayInput(body: body) { (response, error) in +UserAPI().createUsersWithArrayInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -114,7 +114,7 @@ No authorization required # **createUsersWithListInput** ```swift - open class func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -127,7 +127,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithListInput(body: body) { (response, error) in +UserAPI().createUsersWithListInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -162,7 +162,7 @@ No authorization required # **deleteUser** ```swift - open class func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete user @@ -177,7 +177,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be deleted // Delete user -UserAPI.deleteUser(username: username) { (response, error) in +UserAPI().deleteUser(username: username) { (response, error) in guard error == nil else { print(error) return @@ -212,7 +212,7 @@ No authorization required # **getUserByName** ```swift - open class func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) + open func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) ``` Get user by user name @@ -225,7 +225,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be fetched. Use user1 for testing. // Get user by user name -UserAPI.getUserByName(username: username) { (response, error) in +UserAPI().getUserByName(username: username) { (response, error) in guard error == nil else { print(error) return @@ -260,7 +260,7 @@ No authorization required # **loginUser** ```swift - open class func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` Logs user into the system @@ -274,7 +274,7 @@ let username = "username_example" // String | The user name for login let password = "password_example" // String | The password for login in clear text // Logs user into the system -UserAPI.loginUser(username: username, password: password) { (response, error) in +UserAPI().loginUser(username: username, password: password) { (response, error) in guard error == nil else { print(error) return @@ -310,7 +310,7 @@ No authorization required # **logoutUser** ```swift - open class func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Logs out current logged in user session @@ -322,7 +322,7 @@ import PetstoreClient // Logs out current logged in user session -UserAPI.logoutUser() { (response, error) in +UserAPI().logoutUser() { (response, error) in guard error == nil else { print(error) return @@ -354,7 +354,7 @@ No authorization required # **updateUser** ```swift - open class func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updated user @@ -370,7 +370,7 @@ let username = "username_example" // String | name that need to be deleted let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Updated user object // Updated user -UserAPI.updateUser(username: username, body: body) { (response, error) in +UserAPI().updateUser(username: username, body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3ad11a871d5a..49426a6f123a 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -28,15 +28,13 @@ open class RequestBuilder { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders(PetstoreClientAPI.customHeaders) - addCredential() + self.credential = credential } open func addHeaders(_ aHeaders: [String: String]) { @@ -57,8 +55,8 @@ open class RequestBuilder { return self } - open func addCredential() { - credential = PetstoreClientAPI.credential + open func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index a4710970b265..aa6c137d9bfe 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @objcMembers open class AnotherFakeAPI : NSObject { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test special tags @@ -20,7 +39,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -38,9 +57,9 @@ import AnyCodable - parameter body: (body) client model - returns: RequestBuilder */ - open class func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { + open func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/another-fake/dummy" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -49,10 +68,13 @@ import AnyCodable "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index 3f6e3111d931..cbbdb0e8a5f2 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @objcMembers open class FakeAPI : NSObject { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** @@ -19,7 +38,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -36,9 +55,9 @@ import AnyCodable - parameter body: (body) Input boolean as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { + open func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/boolean" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -47,11 +66,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -61,7 +83,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -78,9 +100,9 @@ import AnyCodable - parameter body: (body) Input composite as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { + open func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/composite" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -89,11 +111,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -103,7 +128,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -120,9 +145,9 @@ import AnyCodable - parameter body: (body) Input number as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { + open func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/number" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -131,11 +156,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -145,7 +173,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -162,9 +190,9 @@ import AnyCodable - parameter body: (body) Input string as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { + open func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/string" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -173,11 +201,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -187,7 +218,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -204,9 +235,9 @@ import AnyCodable - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { + open func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { let localVariablePath = "/fake/body-with-file-schema" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -215,11 +246,14 @@ import AnyCodable "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -230,7 +264,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -247,9 +281,9 @@ import AnyCodable - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { + open func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { let localVariablePath = "/fake/body-with-query-params" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -261,11 +295,14 @@ import AnyCodable "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -276,7 +313,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -294,9 +331,9 @@ import AnyCodable - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -305,11 +342,14 @@ import AnyCodable "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -333,7 +373,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result in switch result { case .success: @@ -367,9 +407,9 @@ import AnyCodable - parameter callback: (form) None (optional) - returns: RequestBuilder */ - open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { + open func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "integer": integer?.encodeToJSON(), "int32": int32?.encodeToJSON(), @@ -396,11 +436,14 @@ import AnyCodable "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -485,7 +528,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result in switch result { case .success: @@ -510,9 +553,9 @@ import AnyCodable - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: RequestBuilder */ - open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { + open func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "enum_form_string_array": enumFormStringArray?.encodeToJSON(), "enum_form_string": enumFormString?.encodeToJSON(), @@ -535,11 +578,14 @@ import AnyCodable "enum_header_string": enumHeaderString?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -555,7 +601,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result in switch result { case .success: @@ -578,9 +624,9 @@ import AnyCodable - parameter int64Group: (query) Integer in group parameters (optional) - returns: RequestBuilder */ - open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { + open func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -596,11 +642,14 @@ import AnyCodable "boolean_group": booleanGroup?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -611,7 +660,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result in switch result { case .success: @@ -628,9 +677,9 @@ import AnyCodable - parameter param: (body) request body - returns: RequestBuilder */ - open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { + open func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { let localVariablePath = "/fake/inline-additionalProperties" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -639,11 +688,14 @@ import AnyCodable "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -655,7 +707,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result in switch result { case .success: @@ -673,9 +725,9 @@ import AnyCodable - parameter param2: (form) field2 - returns: RequestBuilder */ - open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { + open func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "param": param.encodeToJSON(), "param2": param2.encodeToJSON(), @@ -690,10 +742,13 @@ import AnyCodable "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index a7356ec8efb3..460ddc939d29 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @objcMembers open class FakeClassnameTags123API : NSObject { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test class name in snake case @@ -20,7 +39,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -41,9 +60,9 @@ import AnyCodable - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake_classname_test" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -52,10 +71,13 @@ import AnyCodable "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index 5510610fcd5b..0b2263f86975 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @objcMembers open class PetAPI : NSObject { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Add a new pet to the store @@ -20,7 +39,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -43,9 +62,9 @@ import AnyCodable - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -54,11 +73,14 @@ import AnyCodable "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -70,7 +92,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result in switch result { case .success: @@ -91,12 +113,12 @@ import AnyCodable - parameter apiKey: (header) (optional) - returns: RequestBuilder */ - open class func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { + open func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -105,11 +127,14 @@ import AnyCodable "api_key": apiKey?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -129,7 +154,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { + open func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { return findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -150,9 +175,9 @@ import AnyCodable - parameter status: (query) Status values that need to be considered for filter - returns: RequestBuilder<[Pet]> */ - open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { + open func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -164,11 +189,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -180,7 +208,7 @@ import AnyCodable */ @available(*, deprecated, message: "This operation is deprecated.") @discardableResult - open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { + open func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { return findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -202,9 +230,9 @@ import AnyCodable - returns: RequestBuilder<[Pet]> */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { + open func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -216,11 +244,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -231,7 +262,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) -> RequestTask { + open func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) -> RequestTask { return getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -252,12 +283,12 @@ import AnyCodable - parameter petId: (path) ID of pet to return - returns: RequestBuilder */ - open class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { + open func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -266,11 +297,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -281,7 +315,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -301,9 +335,9 @@ import AnyCodable - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -312,11 +346,14 @@ import AnyCodable "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -329,7 +366,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result in switch result { case .success: @@ -351,12 +388,12 @@ import AnyCodable - parameter status: (form) Updated status of the pet (optional) - returns: RequestBuilder */ - open class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { + open func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "name": name?.encodeToJSON(), "status": status?.encodeToJSON(), @@ -371,11 +408,14 @@ import AnyCodable "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -388,7 +428,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { return uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -410,12 +450,12 @@ import AnyCodable - parameter file: (form) file to upload (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { + open func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}/uploadImage" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "file": file?.encodeToJSON(), @@ -430,11 +470,14 @@ import AnyCodable "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -447,7 +490,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { return uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -469,12 +512,12 @@ import AnyCodable - parameter additionalMetadata: (form) Additional data to pass to server (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { + open func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { var localVariablePath = "/fake/{petId}/uploadImageWithRequiredFile" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "requiredFile": requiredFile.encodeToJSON(), @@ -489,10 +532,13 @@ import AnyCodable "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index c1d6a5594704..15e240475e91 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @objcMembers open class StoreAPI : NSObject { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Delete purchase order by ID @@ -20,7 +39,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case .success: @@ -38,12 +57,12 @@ import AnyCodable - parameter orderId: (path) ID of the order that needs to be deleted - returns: RequestBuilder */ - open class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { + open func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -52,11 +71,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -66,7 +88,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) -> RequestTask { + open func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) -> RequestTask { return getInventoryWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -86,9 +108,9 @@ import AnyCodable - name: api_key - returns: RequestBuilder<[String: Int]> */ - open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { + open func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -97,11 +119,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -112,7 +137,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { + open func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { return getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -130,12 +155,12 @@ import AnyCodable - parameter orderId: (path) ID of pet that needs to be fetched - returns: RequestBuilder */ - open class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { + open func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -144,11 +169,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -159,7 +187,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { + open func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { return placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -176,9 +204,9 @@ import AnyCodable - parameter body: (body) order placed for purchasing the pet - returns: RequestBuilder */ - open class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { + open func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { let localVariablePath = "/store/order" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -187,10 +215,13 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index b19a47fee245..ed24a6c94fc0 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @objcMembers open class UserAPI : NSObject { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Create user @@ -20,7 +39,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -38,9 +57,9 @@ import AnyCodable - parameter body: (body) Created user object - returns: RequestBuilder */ - open class func createUserWithRequestBuilder(body: User) -> RequestBuilder { + open func createUserWithRequestBuilder(body: User) -> RequestBuilder { let localVariablePath = "/user" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -49,11 +68,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -64,7 +86,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -81,9 +103,9 @@ import AnyCodable - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithArray" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -92,11 +114,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -107,7 +132,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -124,9 +149,9 @@ import AnyCodable - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithList" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -135,11 +160,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -150,7 +178,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case .success: @@ -168,12 +196,12 @@ import AnyCodable - parameter username: (path) The name that needs to be deleted - returns: RequestBuilder */ - open class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { + open func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -182,11 +210,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -197,7 +228,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) -> RequestTask { + open func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) -> RequestTask { return getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -214,12 +245,12 @@ import AnyCodable - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: RequestBuilder */ - open class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { + open func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -228,11 +259,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -244,7 +278,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { + open func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { return loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -263,9 +297,9 @@ import AnyCodable - parameter password: (query) The password for login in clear text - returns: RequestBuilder */ - open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { + open func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { let localVariablePath = "/user/login" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -278,11 +312,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -292,7 +329,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return logoutUserWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case .success: @@ -308,9 +345,9 @@ import AnyCodable - GET /user/logout - returns: RequestBuilder */ - open class func logoutUserWithRequestBuilder() -> RequestBuilder { + open func logoutUserWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/user/logout" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -319,11 +356,14 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -335,7 +375,7 @@ import AnyCodable - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -354,12 +394,12 @@ import AnyCodable - parameter body: (body) Updated user object - returns: RequestBuilder */ - open class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { + open func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -368,10 +408,13 @@ import AnyCodable : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 6fa4d0e20eb9..3f3e8894c3d6 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -71,8 +71,8 @@ open class URLSessionRequestBuilder: RequestBuilder { */ public var taskDidReceiveChallenge: PetstoreClientAPIChallengeHandler? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/objcCompatible/docs/AnotherFakeAPI.md b/samples/client/petstore/swift5/objcCompatible/docs/AnotherFakeAPI.md index 26346e81a4cb..47c30277fb98 100644 --- a/samples/client/petstore/swift5/objcCompatible/docs/AnotherFakeAPI.md +++ b/samples/client/petstore/swift5/objcCompatible/docs/AnotherFakeAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **call123testSpecialTags** ```swift - open class func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test special tags @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test special tags -AnotherFakeAPI.call123testSpecialTags(body: body) { (response, error) in +AnotherFakeAPI().call123testSpecialTags(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/objcCompatible/docs/FakeAPI.md b/samples/client/petstore/swift5/objcCompatible/docs/FakeAPI.md index a75c5864f1c6..c37a92533531 100644 --- a/samples/client/petstore/swift5/objcCompatible/docs/FakeAPI.md +++ b/samples/client/petstore/swift5/objcCompatible/docs/FakeAPI.md @@ -20,7 +20,7 @@ Method | HTTP request | Description # **fakeOuterBooleanSerialize** ```swift - open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) + open func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) ``` @@ -34,7 +34,7 @@ import PetstoreClient let body = true // Bool | Input boolean as post body (optional) -FakeAPI.fakeOuterBooleanSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterBooleanSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -69,7 +69,7 @@ No authorization required # **fakeOuterCompositeSerialize** ```swift - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) ``` @@ -83,7 +83,7 @@ import PetstoreClient let body = OuterComposite(myNumber: 123, myString: "myString_example", myBoolean: false) // OuterComposite | Input composite as post body (optional) -FakeAPI.fakeOuterCompositeSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterCompositeSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -118,7 +118,7 @@ No authorization required # **fakeOuterNumberSerialize** ```swift - open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) + open func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) ``` @@ -132,7 +132,7 @@ import PetstoreClient let body = 987 // Double | Input number as post body (optional) -FakeAPI.fakeOuterNumberSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterNumberSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -167,7 +167,7 @@ No authorization required # **fakeOuterStringSerialize** ```swift - open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` @@ -181,7 +181,7 @@ import PetstoreClient let body = "body_example" // String | Input string as post body (optional) -FakeAPI.fakeOuterStringSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterStringSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -216,7 +216,7 @@ No authorization required # **testBodyWithFileSchema** ```swift - open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -230,7 +230,7 @@ import PetstoreClient let body = FileSchemaTestClass(file: File(sourceURI: "sourceURI_example"), files: [nil]) // FileSchemaTestClass | -FakeAPI.testBodyWithFileSchema(body: body) { (response, error) in +FakeAPI().testBodyWithFileSchema(body: body) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ No authorization required # **testBodyWithQueryParams** ```swift - open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -278,7 +278,7 @@ import PetstoreClient let query = "query_example" // String | let body = User(_id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | -FakeAPI.testBodyWithQueryParams(query: query, body: body) { (response, error) in +FakeAPI().testBodyWithQueryParams(query: query, body: body) { (response, error) in guard error == nil else { print(error) return @@ -314,7 +314,7 @@ No authorization required # **testClientModel** ```swift - open class func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test \"client\" model @@ -329,7 +329,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test \"client\" model -FakeAPI.testClientModel(body: body) { (response, error) in +FakeAPI().testClientModel(body: body) { (response, error) in guard error == nil else { print(error) return @@ -364,7 +364,7 @@ No authorization required # **testEndpointParameters** ```swift - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -392,7 +392,7 @@ let password = "password_example" // String | None (optional) let callback = "callback_example" // String | None (optional) // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 -FakeAPI.testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in +FakeAPI().testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in guard error == nil else { print(error) return @@ -440,7 +440,7 @@ Void (empty response body) # **testEnumParameters** ```swift - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` To test enum parameters @@ -462,7 +462,7 @@ let enumFormStringArray = ["inner_example"] // [String] | Form parameter enum te let enumFormString = "enumFormString_example" // String | Form parameter enum test (string) (optional) (default to .efg) // To test enum parameters -FakeAPI.testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in +FakeAPI().testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in guard error == nil else { print(error) return @@ -504,7 +504,7 @@ No authorization required # **testGroupParameters** ```swift - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint to test group parameters (optional) @@ -524,7 +524,7 @@ let booleanGroup = true // Bool | Boolean in group parameters (optional) let int64Group = 987 // Int64 | Integer in group parameters (optional) // Fake endpoint to test group parameters (optional) -FakeAPI.testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in +FakeAPI().testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in guard error == nil else { print(error) return @@ -564,7 +564,7 @@ No authorization required # **testInlineAdditionalProperties** ```swift - open class func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test inline additionalProperties @@ -577,7 +577,7 @@ import PetstoreClient let param = "TODO" // [String: String] | request body // test inline additionalProperties -FakeAPI.testInlineAdditionalProperties(param: param) { (response, error) in +FakeAPI().testInlineAdditionalProperties(param: param) { (response, error) in guard error == nil else { print(error) return @@ -612,7 +612,7 @@ No authorization required # **testJsonFormData** ```swift - open class func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test json serialization of form data @@ -626,7 +626,7 @@ let param = "param_example" // String | field1 let param2 = "param2_example" // String | field2 // test json serialization of form data -FakeAPI.testJsonFormData(param: param, param2: param2) { (response, error) in +FakeAPI().testJsonFormData(param: param, param2: param2) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/objcCompatible/docs/FakeClassnameTags123API.md b/samples/client/petstore/swift5/objcCompatible/docs/FakeClassnameTags123API.md index 5b9b66073fe0..7ef18c9cc1d5 100644 --- a/samples/client/petstore/swift5/objcCompatible/docs/FakeClassnameTags123API.md +++ b/samples/client/petstore/swift5/objcCompatible/docs/FakeClassnameTags123API.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **testClassname** ```swift - open class func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test class name in snake case @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test class name in snake case -FakeClassnameTags123API.testClassname(body: body) { (response, error) in +FakeClassnameTags123API().testClassname(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/objcCompatible/docs/PetAPI.md b/samples/client/petstore/swift5/objcCompatible/docs/PetAPI.md index 508d13dae383..4a296049d3a1 100644 --- a/samples/client/petstore/swift5/objcCompatible/docs/PetAPI.md +++ b/samples/client/petstore/swift5/objcCompatible/docs/PetAPI.md @@ -17,7 +17,7 @@ Method | HTTP request | Description # **addPet** ```swift - open class func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Add a new pet to the store @@ -30,7 +30,7 @@ import PetstoreClient let body = Pet(_id: 123, category: Category(_id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(_id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Add a new pet to the store -PetAPI.addPet(body: body) { (response, error) in +PetAPI().addPet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -65,7 +65,7 @@ Void (empty response body) # **deletePet** ```swift - open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Deletes a pet @@ -79,7 +79,7 @@ let petId = 987 // Int64 | Pet id to delete let apiKey = "apiKey_example" // String | (optional) // Deletes a pet -PetAPI.deletePet(petId: petId, apiKey: apiKey) { (response, error) in +PetAPI().deletePet(petId: petId, apiKey: apiKey) { (response, error) in guard error == nil else { print(error) return @@ -115,7 +115,7 @@ Void (empty response body) # **findPetsByStatus** ```swift - open class func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + open func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by status @@ -130,7 +130,7 @@ import PetstoreClient let status = ["status_example"] // [String] | Status values that need to be considered for filter // Finds Pets by status -PetAPI.findPetsByStatus(status: status) { (response, error) in +PetAPI().findPetsByStatus(status: status) { (response, error) in guard error == nil else { print(error) return @@ -165,7 +165,7 @@ Name | Type | Description | Notes # **findPetsByTags** ```swift - open class func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + open func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by tags @@ -180,7 +180,7 @@ import PetstoreClient let tags = ["inner_example"] // [String] | Tags to filter by // Finds Pets by tags -PetAPI.findPetsByTags(tags: tags) { (response, error) in +PetAPI().findPetsByTags(tags: tags) { (response, error) in guard error == nil else { print(error) return @@ -215,7 +215,7 @@ Name | Type | Description | Notes # **getPetById** ```swift - open class func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) + open func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) ``` Find pet by ID @@ -230,7 +230,7 @@ import PetstoreClient let petId = 987 // Int64 | ID of pet to return // Find pet by ID -PetAPI.getPetById(petId: petId) { (response, error) in +PetAPI().getPetById(petId: petId) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ Name | Type | Description | Notes # **updatePet** ```swift - open class func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Update an existing pet @@ -278,7 +278,7 @@ import PetstoreClient let body = Pet(_id: 123, category: Category(_id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(_id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Update an existing pet -PetAPI.updatePet(body: body) { (response, error) in +PetAPI().updatePet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -313,7 +313,7 @@ Void (empty response body) # **updatePetWithForm** ```swift - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updates a pet in the store with form data @@ -328,7 +328,7 @@ let name = "name_example" // String | Updated name of the pet (optional) let status = "status_example" // String | Updated status of the pet (optional) // Updates a pet in the store with form data -PetAPI.updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in +PetAPI().updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in guard error == nil else { print(error) return @@ -365,7 +365,7 @@ Void (empty response body) # **uploadFile** ```swift - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image @@ -380,7 +380,7 @@ let additionalMetadata = "additionalMetadata_example" // String | Additional dat let file = URL(string: "https://example.com")! // URL | file to upload (optional) // uploads an image -PetAPI.uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in +PetAPI().uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in guard error == nil else { print(error) return @@ -417,7 +417,7 @@ Name | Type | Description | Notes # **uploadFileWithRequiredFile** ```swift - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image (required) @@ -432,7 +432,7 @@ let requiredFile = URL(string: "https://example.com")! // URL | file to upload let additionalMetadata = "additionalMetadata_example" // String | Additional data to pass to server (optional) // uploads an image (required) -PetAPI.uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in +PetAPI().uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/objcCompatible/docs/StoreAPI.md b/samples/client/petstore/swift5/objcCompatible/docs/StoreAPI.md index 6480c8639120..1d207546e2b8 100644 --- a/samples/client/petstore/swift5/objcCompatible/docs/StoreAPI.md +++ b/samples/client/petstore/swift5/objcCompatible/docs/StoreAPI.md @@ -12,7 +12,7 @@ Method | HTTP request | Description # **deleteOrder** ```swift - open class func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete purchase order by ID @@ -27,7 +27,7 @@ import PetstoreClient let orderId = "orderId_example" // String | ID of the order that needs to be deleted // Delete purchase order by ID -StoreAPI.deleteOrder(orderId: orderId) { (response, error) in +StoreAPI().deleteOrder(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -62,7 +62,7 @@ No authorization required # **getInventory** ```swift - open class func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) + open func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) ``` Returns pet inventories by status @@ -76,7 +76,7 @@ import PetstoreClient // Returns pet inventories by status -StoreAPI.getInventory() { (response, error) in +StoreAPI().getInventory() { (response, error) in guard error == nil else { print(error) return @@ -108,7 +108,7 @@ This endpoint does not need any parameter. # **getOrderById** ```swift - open class func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Find purchase order by ID @@ -123,7 +123,7 @@ import PetstoreClient let orderId = 987 // Int64 | ID of pet that needs to be fetched // Find purchase order by ID -StoreAPI.getOrderById(orderId: orderId) { (response, error) in +StoreAPI().getOrderById(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -158,7 +158,7 @@ No authorization required # **placeOrder** ```swift - open class func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Place an order for a pet @@ -171,7 +171,7 @@ import PetstoreClient let body = Order(_id: 123, petId: 123, quantity: 123, shipDate: Date(), status: "status_example", complete: false) // Order | order placed for purchasing the pet // Place an order for a pet -StoreAPI.placeOrder(body: body) { (response, error) in +StoreAPI().placeOrder(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/objcCompatible/docs/UserAPI.md b/samples/client/petstore/swift5/objcCompatible/docs/UserAPI.md index dd2d5009670a..558243ec0960 100644 --- a/samples/client/petstore/swift5/objcCompatible/docs/UserAPI.md +++ b/samples/client/petstore/swift5/objcCompatible/docs/UserAPI.md @@ -16,7 +16,7 @@ Method | HTTP request | Description # **createUser** ```swift - open class func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Create user @@ -31,7 +31,7 @@ import PetstoreClient let body = User(_id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Created user object // Create user -UserAPI.createUser(body: body) { (response, error) in +UserAPI().createUser(body: body) { (response, error) in guard error == nil else { print(error) return @@ -66,7 +66,7 @@ No authorization required # **createUsersWithArrayInput** ```swift - open class func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -79,7 +79,7 @@ import PetstoreClient let body = [User(_id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithArrayInput(body: body) { (response, error) in +UserAPI().createUsersWithArrayInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -114,7 +114,7 @@ No authorization required # **createUsersWithListInput** ```swift - open class func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -127,7 +127,7 @@ import PetstoreClient let body = [User(_id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithListInput(body: body) { (response, error) in +UserAPI().createUsersWithListInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -162,7 +162,7 @@ No authorization required # **deleteUser** ```swift - open class func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete user @@ -177,7 +177,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be deleted // Delete user -UserAPI.deleteUser(username: username) { (response, error) in +UserAPI().deleteUser(username: username) { (response, error) in guard error == nil else { print(error) return @@ -212,7 +212,7 @@ No authorization required # **getUserByName** ```swift - open class func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) + open func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) ``` Get user by user name @@ -225,7 +225,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be fetched. Use user1 for testing. // Get user by user name -UserAPI.getUserByName(username: username) { (response, error) in +UserAPI().getUserByName(username: username) { (response, error) in guard error == nil else { print(error) return @@ -260,7 +260,7 @@ No authorization required # **loginUser** ```swift - open class func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` Logs user into the system @@ -274,7 +274,7 @@ let username = "username_example" // String | The user name for login let password = "password_example" // String | The password for login in clear text // Logs user into the system -UserAPI.loginUser(username: username, password: password) { (response, error) in +UserAPI().loginUser(username: username, password: password) { (response, error) in guard error == nil else { print(error) return @@ -310,7 +310,7 @@ No authorization required # **logoutUser** ```swift - open class func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Logs out current logged in user session @@ -322,7 +322,7 @@ import PetstoreClient // Logs out current logged in user session -UserAPI.logoutUser() { (response, error) in +UserAPI().logoutUser() { (response, error) in guard error == nil else { print(error) return @@ -354,7 +354,7 @@ No authorization required # **updateUser** ```swift - open class func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updated user @@ -370,7 +370,7 @@ let username = "username_example" // String | name that need to be deleted let body = User(_id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Updated user object // Updated user -UserAPI.updateUser(username: username, body: body) { (response, error) in +UserAPI().updateUser(username: username, body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIs.swift index ac0a6317e6ef..cfc89b47da3a 100644 --- a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -28,15 +28,13 @@ open class RequestBuilder { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders(PetstoreClientAPI.customHeaders) - addCredential() + self.credential = credential } open func addHeaders(_ aHeaders: [String: String]) { @@ -57,8 +55,8 @@ open class RequestBuilder { return self } - open func addCredential() { - credential = PetstoreClientAPI.credential + open func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift index b99ae9d54205..0d4e288c7b1f 100644 --- a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift +++ b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class DefaultAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** @@ -18,7 +37,7 @@ open class DefaultAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func rootGet(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Fruit?, _ error: Error?) -> Void)) -> RequestTask { + open func rootGet(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Fruit?, _ error: Error?) -> Void)) -> RequestTask { return rootGetWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -33,9 +52,9 @@ open class DefaultAPI { - GET / - returns: RequestBuilder */ - open class func rootGetWithRequestBuilder() -> RequestBuilder { + open func rootGetWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -44,10 +63,13 @@ open class DefaultAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 6fa4d0e20eb9..3f3e8894c3d6 100644 --- a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -71,8 +71,8 @@ open class URLSessionRequestBuilder: RequestBuilder { */ public var taskDidReceiveChallenge: PetstoreClientAPIChallengeHandler? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/oneOf/docs/DefaultAPI.md b/samples/client/petstore/swift5/oneOf/docs/DefaultAPI.md index 18647665e29c..83792e1f8c25 100644 --- a/samples/client/petstore/swift5/oneOf/docs/DefaultAPI.md +++ b/samples/client/petstore/swift5/oneOf/docs/DefaultAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **rootGet** ```swift - open class func rootGet(completion: @escaping (_ data: Fruit?, _ error: Error?) -> Void) + open func rootGet(completion: @escaping (_ data: Fruit?, _ error: Error?) -> Void) ``` @@ -20,7 +20,7 @@ Method | HTTP request | Description import PetstoreClient -DefaultAPI.rootGet() { (response, error) in +DefaultAPI().rootGet() { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3ad11a871d5a..49426a6f123a 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -28,15 +28,13 @@ open class RequestBuilder { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders(PetstoreClientAPI.customHeaders) - addCredential() + self.credential = credential } open func addHeaders(_ aHeaders: [String: String]) { @@ -57,8 +55,8 @@ open class RequestBuilder { return self } - open func addCredential() { - credential = PetstoreClientAPI.credential + open func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index e8ad6419443e..76f10e6abbf1 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import PromiseKit #if canImport(AnyCodable) import AnyCodable #endif open class AnotherFakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test special tags @@ -19,7 +38,7 @@ open class AnotherFakeAPI { - parameter body: (body) client model - returns: Promise */ - open class func call123testSpecialTags( body: Client) -> Promise { + open func call123testSpecialTags( body: Client) -> Promise { let deferred = Promise.pending() call123testSpecialTagsWithRequestBuilder(body: body).execute { result in switch result { @@ -39,9 +58,9 @@ open class AnotherFakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { + open func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/another-fake/dummy" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -50,10 +69,13 @@ open class AnotherFakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index 9358f7ce983f..e2c1fe7e9eaf 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -6,19 +6,38 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import PromiseKit #if canImport(AnyCodable) import AnyCodable #endif open class FakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** - parameter body: (body) Input boolean as post body (optional) - returns: Promise */ - open class func fakeOuterBooleanSerialize( body: Bool? = nil) -> Promise { + open func fakeOuterBooleanSerialize( body: Bool? = nil) -> Promise { let deferred = Promise.pending() fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute { result in switch result { @@ -37,9 +56,9 @@ open class FakeAPI { - parameter body: (body) Input boolean as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { + open func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/boolean" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -48,11 +67,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -60,7 +82,7 @@ open class FakeAPI { - parameter body: (body) Input composite as post body (optional) - returns: Promise */ - open class func fakeOuterCompositeSerialize( body: OuterComposite? = nil) -> Promise { + open func fakeOuterCompositeSerialize( body: OuterComposite? = nil) -> Promise { let deferred = Promise.pending() fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute { result in switch result { @@ -79,9 +101,9 @@ open class FakeAPI { - parameter body: (body) Input composite as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { + open func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/composite" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -90,11 +112,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -102,7 +127,7 @@ open class FakeAPI { - parameter body: (body) Input number as post body (optional) - returns: Promise */ - open class func fakeOuterNumberSerialize( body: Double? = nil) -> Promise { + open func fakeOuterNumberSerialize( body: Double? = nil) -> Promise { let deferred = Promise.pending() fakeOuterNumberSerializeWithRequestBuilder(body: body).execute { result in switch result { @@ -121,9 +146,9 @@ open class FakeAPI { - parameter body: (body) Input number as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { + open func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/number" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -132,11 +157,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -144,7 +172,7 @@ open class FakeAPI { - parameter body: (body) Input string as post body (optional) - returns: Promise */ - open class func fakeOuterStringSerialize( body: String? = nil) -> Promise { + open func fakeOuterStringSerialize( body: String? = nil) -> Promise { let deferred = Promise.pending() fakeOuterStringSerializeWithRequestBuilder(body: body).execute { result in switch result { @@ -163,9 +191,9 @@ open class FakeAPI { - parameter body: (body) Input string as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { + open func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/string" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -174,11 +202,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -186,7 +217,7 @@ open class FakeAPI { - parameter body: (body) - returns: Promise */ - open class func testBodyWithFileSchema( body: FileSchemaTestClass) -> Promise { + open func testBodyWithFileSchema( body: FileSchemaTestClass) -> Promise { let deferred = Promise.pending() testBodyWithFileSchemaWithRequestBuilder(body: body).execute { result in switch result { @@ -205,9 +236,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { + open func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { let localVariablePath = "/fake/body-with-file-schema" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -216,11 +247,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -229,7 +263,7 @@ open class FakeAPI { - parameter body: (body) - returns: Promise */ - open class func testBodyWithQueryParams( query: String, body: User) -> Promise { + open func testBodyWithQueryParams( query: String, body: User) -> Promise { let deferred = Promise.pending() testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute { result in switch result { @@ -248,9 +282,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { + open func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { let localVariablePath = "/fake/body-with-query-params" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -262,11 +296,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -275,7 +312,7 @@ open class FakeAPI { - parameter body: (body) client model - returns: Promise */ - open class func testClientModel( body: Client) -> Promise { + open func testClientModel( body: Client) -> Promise { let deferred = Promise.pending() testClientModelWithRequestBuilder(body: body).execute { result in switch result { @@ -295,9 +332,9 @@ open class FakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -306,11 +343,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -332,7 +372,7 @@ open class FakeAPI { - parameter callback: (form) None (optional) - returns: Promise */ - open class func testEndpointParameters( number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> Promise { + open func testEndpointParameters( number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> Promise { let deferred = Promise.pending() testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { result in switch result { @@ -368,9 +408,9 @@ open class FakeAPI { - parameter callback: (form) None (optional) - returns: RequestBuilder */ - open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { + open func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "integer": integer?.encodeToJSON(), "int32": int32?.encodeToJSON(), @@ -397,11 +437,14 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -484,7 +527,7 @@ open class FakeAPI { - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: Promise */ - open class func testEnumParameters( enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> Promise { + open func testEnumParameters( enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> Promise { let deferred = Promise.pending() testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute { result in switch result { @@ -511,9 +554,9 @@ open class FakeAPI { - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: RequestBuilder */ - open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { + open func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "enum_form_string_array": enumFormStringArray?.encodeToJSON(), "enum_form_string": enumFormString?.encodeToJSON(), @@ -536,11 +579,14 @@ open class FakeAPI { "enum_header_string": enumHeaderString?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -554,7 +600,7 @@ open class FakeAPI { - parameter int64Group: (query) Integer in group parameters (optional) - returns: Promise */ - open class func testGroupParameters( requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> Promise { + open func testGroupParameters( requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> Promise { let deferred = Promise.pending() testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute { result in switch result { @@ -579,9 +625,9 @@ open class FakeAPI { - parameter int64Group: (query) Integer in group parameters (optional) - returns: RequestBuilder */ - open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { + open func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -597,11 +643,14 @@ open class FakeAPI { "boolean_group": booleanGroup?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -610,7 +659,7 @@ open class FakeAPI { - parameter param: (body) request body - returns: Promise */ - open class func testInlineAdditionalProperties( param: [String: String]) -> Promise { + open func testInlineAdditionalProperties( param: [String: String]) -> Promise { let deferred = Promise.pending() testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute { result in switch result { @@ -629,9 +678,9 @@ open class FakeAPI { - parameter param: (body) request body - returns: RequestBuilder */ - open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { + open func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { let localVariablePath = "/fake/inline-additionalProperties" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -640,11 +689,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -654,7 +706,7 @@ open class FakeAPI { - parameter param2: (form) field2 - returns: Promise */ - open class func testJsonFormData( param: String, param2: String) -> Promise { + open func testJsonFormData( param: String, param2: String) -> Promise { let deferred = Promise.pending() testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { result in switch result { @@ -674,9 +726,9 @@ open class FakeAPI { - parameter param2: (form) field2 - returns: RequestBuilder */ - open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { + open func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "param": param.encodeToJSON(), "param2": param2.encodeToJSON(), @@ -691,10 +743,13 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index a4645e9f8aa2..e541a8fea891 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import PromiseKit #if canImport(AnyCodable) import AnyCodable #endif open class FakeClassnameTags123API { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test class name in snake case @@ -19,7 +38,7 @@ open class FakeClassnameTags123API { - parameter body: (body) client model - returns: Promise */ - open class func testClassname( body: Client) -> Promise { + open func testClassname( body: Client) -> Promise { let deferred = Promise.pending() testClassnameWithRequestBuilder(body: body).execute { result in switch result { @@ -42,9 +61,9 @@ open class FakeClassnameTags123API { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake_classname_test" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -53,10 +72,13 @@ open class FakeClassnameTags123API { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index c2813aa9f6ed..21a623b26052 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import PromiseKit #if canImport(AnyCodable) import AnyCodable #endif open class PetAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Add a new pet to the store @@ -19,7 +38,7 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: Promise */ - open class func addPet( body: Pet) -> Promise { + open func addPet( body: Pet) -> Promise { let deferred = Promise.pending() addPetWithRequestBuilder(body: body).execute { result in switch result { @@ -44,9 +63,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -55,11 +74,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -69,7 +91,7 @@ open class PetAPI { - parameter apiKey: (header) (optional) - returns: Promise */ - open class func deletePet( petId: Int64, apiKey: String? = nil) -> Promise { + open func deletePet( petId: Int64, apiKey: String? = nil) -> Promise { let deferred = Promise.pending() deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute { result in switch result { @@ -92,12 +114,12 @@ open class PetAPI { - parameter apiKey: (header) (optional) - returns: RequestBuilder */ - open class func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { + open func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -106,11 +128,14 @@ open class PetAPI { "api_key": apiKey?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -128,7 +153,7 @@ open class PetAPI { - parameter status: (query) Status values that need to be considered for filter - returns: Promise<[Pet]> */ - open class func findPetsByStatus( status: [Status_findPetsByStatus]) -> Promise<[Pet]> { + open func findPetsByStatus( status: [Status_findPetsByStatus]) -> Promise<[Pet]> { let deferred = Promise<[Pet]>.pending() findPetsByStatusWithRequestBuilder(status: status).execute { result in switch result { @@ -151,9 +176,9 @@ open class PetAPI { - parameter status: (query) Status values that need to be considered for filter - returns: RequestBuilder<[Pet]> */ - open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { + open func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -165,11 +190,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -179,7 +207,7 @@ open class PetAPI { - returns: Promise<[Pet]> */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTags( tags: [String]) -> Promise<[Pet]> { + open func findPetsByTags( tags: [String]) -> Promise<[Pet]> { let deferred = Promise<[Pet]>.pending() findPetsByTagsWithRequestBuilder(tags: tags).execute { result in switch result { @@ -203,9 +231,9 @@ open class PetAPI { - returns: RequestBuilder<[Pet]> */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { + open func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -217,11 +245,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -230,7 +261,7 @@ open class PetAPI { - parameter petId: (path) ID of pet to return - returns: Promise */ - open class func getPetById( petId: Int64) -> Promise { + open func getPetById( petId: Int64) -> Promise { let deferred = Promise.pending() getPetByIdWithRequestBuilder(petId: petId).execute { result in switch result { @@ -253,12 +284,12 @@ open class PetAPI { - parameter petId: (path) ID of pet to return - returns: RequestBuilder */ - open class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { + open func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -267,11 +298,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -280,7 +314,7 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: Promise */ - open class func updatePet( body: Pet) -> Promise { + open func updatePet( body: Pet) -> Promise { let deferred = Promise.pending() updatePetWithRequestBuilder(body: body).execute { result in switch result { @@ -302,9 +336,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -313,11 +347,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -328,7 +365,7 @@ open class PetAPI { - parameter status: (form) Updated status of the pet (optional) - returns: Promise */ - open class func updatePetWithForm( petId: Int64, name: String? = nil, status: String? = nil) -> Promise { + open func updatePetWithForm( petId: Int64, name: String? = nil, status: String? = nil) -> Promise { let deferred = Promise.pending() updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute { result in switch result { @@ -352,12 +389,12 @@ open class PetAPI { - parameter status: (form) Updated status of the pet (optional) - returns: RequestBuilder */ - open class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { + open func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "name": name?.encodeToJSON(), "status": status?.encodeToJSON(), @@ -372,11 +409,14 @@ open class PetAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -387,7 +427,7 @@ open class PetAPI { - parameter file: (form) file to upload (optional) - returns: Promise */ - open class func uploadFile( petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> Promise { + open func uploadFile( petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> Promise { let deferred = Promise.pending() uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute { result in switch result { @@ -411,12 +451,12 @@ open class PetAPI { - parameter file: (form) file to upload (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { + open func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}/uploadImage" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "file": file?.encodeToJSON(), @@ -431,11 +471,14 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -446,7 +489,7 @@ open class PetAPI { - parameter additionalMetadata: (form) Additional data to pass to server (optional) - returns: Promise */ - open class func uploadFileWithRequiredFile( petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> Promise { + open func uploadFileWithRequiredFile( petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> Promise { let deferred = Promise.pending() uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute { result in switch result { @@ -470,12 +513,12 @@ open class PetAPI { - parameter additionalMetadata: (form) Additional data to pass to server (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { + open func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { var localVariablePath = "/fake/{petId}/uploadImageWithRequiredFile" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "requiredFile": requiredFile.encodeToJSON(), @@ -490,10 +533,13 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index bcba455ea172..de569f502fcc 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import PromiseKit #if canImport(AnyCodable) import AnyCodable #endif open class StoreAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Delete purchase order by ID @@ -19,7 +38,7 @@ open class StoreAPI { - parameter orderId: (path) ID of the order that needs to be deleted - returns: Promise */ - open class func deleteOrder( orderId: String) -> Promise { + open func deleteOrder( orderId: String) -> Promise { let deferred = Promise.pending() deleteOrderWithRequestBuilder(orderId: orderId).execute { result in switch result { @@ -39,12 +58,12 @@ open class StoreAPI { - parameter orderId: (path) ID of the order that needs to be deleted - returns: RequestBuilder */ - open class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { + open func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -53,11 +72,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -65,7 +87,7 @@ open class StoreAPI { - returns: Promise<[String: Int]> */ - open class func getInventory() -> Promise<[String: Int]> { + open func getInventory() -> Promise<[String: Int]> { let deferred = Promise<[String: Int]>.pending() getInventoryWithRequestBuilder().execute { result in switch result { @@ -87,9 +109,9 @@ open class StoreAPI { - name: api_key - returns: RequestBuilder<[String: Int]> */ - open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { + open func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -98,11 +120,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -111,7 +136,7 @@ open class StoreAPI { - parameter orderId: (path) ID of pet that needs to be fetched - returns: Promise */ - open class func getOrderById( orderId: Int64) -> Promise { + open func getOrderById( orderId: Int64) -> Promise { let deferred = Promise.pending() getOrderByIdWithRequestBuilder(orderId: orderId).execute { result in switch result { @@ -131,12 +156,12 @@ open class StoreAPI { - parameter orderId: (path) ID of pet that needs to be fetched - returns: RequestBuilder */ - open class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { + open func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -145,11 +170,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -158,7 +186,7 @@ open class StoreAPI { - parameter body: (body) order placed for purchasing the pet - returns: Promise */ - open class func placeOrder( body: Order) -> Promise { + open func placeOrder( body: Order) -> Promise { let deferred = Promise.pending() placeOrderWithRequestBuilder(body: body).execute { result in switch result { @@ -177,9 +205,9 @@ open class StoreAPI { - parameter body: (body) order placed for purchasing the pet - returns: RequestBuilder */ - open class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { + open func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { let localVariablePath = "/store/order" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -188,10 +216,13 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index 611917e6ad8a..dcae660bcd93 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import PromiseKit #if canImport(AnyCodable) import AnyCodable #endif open class UserAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Create user @@ -19,7 +38,7 @@ open class UserAPI { - parameter body: (body) Created user object - returns: Promise */ - open class func createUser( body: User) -> Promise { + open func createUser( body: User) -> Promise { let deferred = Promise.pending() createUserWithRequestBuilder(body: body).execute { result in switch result { @@ -39,9 +58,9 @@ open class UserAPI { - parameter body: (body) Created user object - returns: RequestBuilder */ - open class func createUserWithRequestBuilder(body: User) -> RequestBuilder { + open func createUserWithRequestBuilder(body: User) -> RequestBuilder { let localVariablePath = "/user" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -50,11 +69,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -63,7 +85,7 @@ open class UserAPI { - parameter body: (body) List of user object - returns: Promise */ - open class func createUsersWithArrayInput( body: [User]) -> Promise { + open func createUsersWithArrayInput( body: [User]) -> Promise { let deferred = Promise.pending() createUsersWithArrayInputWithRequestBuilder(body: body).execute { result in switch result { @@ -82,9 +104,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithArray" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -93,11 +115,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -106,7 +131,7 @@ open class UserAPI { - parameter body: (body) List of user object - returns: Promise */ - open class func createUsersWithListInput( body: [User]) -> Promise { + open func createUsersWithListInput( body: [User]) -> Promise { let deferred = Promise.pending() createUsersWithListInputWithRequestBuilder(body: body).execute { result in switch result { @@ -125,9 +150,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithList" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -136,11 +161,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -149,7 +177,7 @@ open class UserAPI { - parameter username: (path) The name that needs to be deleted - returns: Promise */ - open class func deleteUser( username: String) -> Promise { + open func deleteUser( username: String) -> Promise { let deferred = Promise.pending() deleteUserWithRequestBuilder(username: username).execute { result in switch result { @@ -169,12 +197,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be deleted - returns: RequestBuilder */ - open class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { + open func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -183,11 +211,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -196,7 +227,7 @@ open class UserAPI { - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: Promise */ - open class func getUserByName( username: String) -> Promise { + open func getUserByName( username: String) -> Promise { let deferred = Promise.pending() getUserByNameWithRequestBuilder(username: username).execute { result in switch result { @@ -215,12 +246,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: RequestBuilder */ - open class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { + open func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -229,11 +260,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -243,7 +277,7 @@ open class UserAPI { - parameter password: (query) The password for login in clear text - returns: Promise */ - open class func loginUser( username: String, password: String) -> Promise { + open func loginUser( username: String, password: String) -> Promise { let deferred = Promise.pending() loginUserWithRequestBuilder(username: username, password: password).execute { result in switch result { @@ -264,9 +298,9 @@ open class UserAPI { - parameter password: (query) The password for login in clear text - returns: RequestBuilder */ - open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { + open func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { let localVariablePath = "/user/login" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -279,11 +313,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -291,7 +328,7 @@ open class UserAPI { - returns: Promise */ - open class func logoutUser() -> Promise { + open func logoutUser() -> Promise { let deferred = Promise.pending() logoutUserWithRequestBuilder().execute { result in switch result { @@ -309,9 +346,9 @@ open class UserAPI { - GET /user/logout - returns: RequestBuilder */ - open class func logoutUserWithRequestBuilder() -> RequestBuilder { + open func logoutUserWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/user/logout" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -320,11 +357,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -334,7 +374,7 @@ open class UserAPI { - parameter body: (body) Updated user object - returns: Promise */ - open class func updateUser( username: String, body: User) -> Promise { + open func updateUser( username: String, body: User) -> Promise { let deferred = Promise.pending() updateUserWithRequestBuilder(username: username, body: body).execute { result in switch result { @@ -355,12 +395,12 @@ open class UserAPI { - parameter body: (body) Updated user object - returns: RequestBuilder */ - open class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { + open func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -369,10 +409,13 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 6fa4d0e20eb9..3f3e8894c3d6 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -71,8 +71,8 @@ open class URLSessionRequestBuilder: RequestBuilder { */ public var taskDidReceiveChallenge: PetstoreClientAPIChallengeHandler? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/promisekitLibrary/docs/AnotherFakeAPI.md b/samples/client/petstore/swift5/promisekitLibrary/docs/AnotherFakeAPI.md index dd75fccf4a6b..ea05721f2316 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/docs/AnotherFakeAPI.md +++ b/samples/client/petstore/swift5/promisekitLibrary/docs/AnotherFakeAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **call123testSpecialTags** ```swift - open class func call123testSpecialTags( body: Client) -> Promise + open func call123testSpecialTags( body: Client) -> Promise ``` To test special tags @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test special tags -AnotherFakeAPI.call123testSpecialTags(body: body).then { +AnotherFakeAPI().call123testSpecialTags(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected diff --git a/samples/client/petstore/swift5/promisekitLibrary/docs/FakeAPI.md b/samples/client/petstore/swift5/promisekitLibrary/docs/FakeAPI.md index 5164a64867d8..1b3edce1e84e 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/docs/FakeAPI.md +++ b/samples/client/petstore/swift5/promisekitLibrary/docs/FakeAPI.md @@ -20,7 +20,7 @@ Method | HTTP request | Description # **fakeOuterBooleanSerialize** ```swift - open class func fakeOuterBooleanSerialize( body: Bool? = nil) -> Promise + open func fakeOuterBooleanSerialize( body: Bool? = nil) -> Promise ``` @@ -34,7 +34,7 @@ import PetstoreClient let body = true // Bool | Input boolean as post body (optional) -FakeAPI.fakeOuterBooleanSerialize(body: body).then { +FakeAPI().fakeOuterBooleanSerialize(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -66,7 +66,7 @@ No authorization required # **fakeOuterCompositeSerialize** ```swift - open class func fakeOuterCompositeSerialize( body: OuterComposite? = nil) -> Promise + open func fakeOuterCompositeSerialize( body: OuterComposite? = nil) -> Promise ``` @@ -80,7 +80,7 @@ import PetstoreClient let body = OuterComposite(myNumber: 123, myString: "myString_example", myBoolean: false) // OuterComposite | Input composite as post body (optional) -FakeAPI.fakeOuterCompositeSerialize(body: body).then { +FakeAPI().fakeOuterCompositeSerialize(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -112,7 +112,7 @@ No authorization required # **fakeOuterNumberSerialize** ```swift - open class func fakeOuterNumberSerialize( body: Double? = nil) -> Promise + open func fakeOuterNumberSerialize( body: Double? = nil) -> Promise ``` @@ -126,7 +126,7 @@ import PetstoreClient let body = 987 // Double | Input number as post body (optional) -FakeAPI.fakeOuterNumberSerialize(body: body).then { +FakeAPI().fakeOuterNumberSerialize(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -158,7 +158,7 @@ No authorization required # **fakeOuterStringSerialize** ```swift - open class func fakeOuterStringSerialize( body: String? = nil) -> Promise + open func fakeOuterStringSerialize( body: String? = nil) -> Promise ``` @@ -172,7 +172,7 @@ import PetstoreClient let body = "body_example" // String | Input string as post body (optional) -FakeAPI.fakeOuterStringSerialize(body: body).then { +FakeAPI().fakeOuterStringSerialize(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -204,7 +204,7 @@ No authorization required # **testBodyWithFileSchema** ```swift - open class func testBodyWithFileSchema( body: FileSchemaTestClass) -> Promise + open func testBodyWithFileSchema( body: FileSchemaTestClass) -> Promise ``` @@ -218,7 +218,7 @@ import PetstoreClient let body = FileSchemaTestClass(file: File(sourceURI: "sourceURI_example"), files: [nil]) // FileSchemaTestClass | -FakeAPI.testBodyWithFileSchema(body: body).then { +FakeAPI().testBodyWithFileSchema(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -250,7 +250,7 @@ No authorization required # **testBodyWithQueryParams** ```swift - open class func testBodyWithQueryParams( query: String, body: User) -> Promise + open func testBodyWithQueryParams( query: String, body: User) -> Promise ``` @@ -263,7 +263,7 @@ import PetstoreClient let query = "query_example" // String | let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | -FakeAPI.testBodyWithQueryParams(query: query, body: body).then { +FakeAPI().testBodyWithQueryParams(query: query, body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -296,7 +296,7 @@ No authorization required # **testClientModel** ```swift - open class func testClientModel( body: Client) -> Promise + open func testClientModel( body: Client) -> Promise ``` To test \"client\" model @@ -311,7 +311,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test \"client\" model -FakeAPI.testClientModel(body: body).then { +FakeAPI().testClientModel(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -343,7 +343,7 @@ No authorization required # **testEndpointParameters** ```swift - open class func testEndpointParameters( number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> Promise + open func testEndpointParameters( number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> Promise ``` Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -371,7 +371,7 @@ let password = "password_example" // String | None (optional) let callback = "callback_example" // String | None (optional) // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 -FakeAPI.testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).then { +FakeAPI().testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -416,7 +416,7 @@ Void (empty response body) # **testEnumParameters** ```swift - open class func testEnumParameters( enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> Promise + open func testEnumParameters( enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> Promise ``` To test enum parameters @@ -438,7 +438,7 @@ let enumFormStringArray = ["inner_example"] // [String] | Form parameter enum te let enumFormString = "enumFormString_example" // String | Form parameter enum test (string) (optional) (default to .efg) // To test enum parameters -FakeAPI.testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).then { +FakeAPI().testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -477,7 +477,7 @@ No authorization required # **testGroupParameters** ```swift - open class func testGroupParameters( requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> Promise + open func testGroupParameters( requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> Promise ``` Fake endpoint to test group parameters (optional) @@ -497,7 +497,7 @@ let booleanGroup = true // Bool | Boolean in group parameters (optional) let int64Group = 987 // Int64 | Integer in group parameters (optional) // Fake endpoint to test group parameters (optional) -FakeAPI.testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).then { +FakeAPI().testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -534,7 +534,7 @@ No authorization required # **testInlineAdditionalProperties** ```swift - open class func testInlineAdditionalProperties( param: [String: String]) -> Promise + open func testInlineAdditionalProperties( param: [String: String]) -> Promise ``` test inline additionalProperties @@ -547,7 +547,7 @@ import PetstoreClient let param = "TODO" // [String: String] | request body // test inline additionalProperties -FakeAPI.testInlineAdditionalProperties(param: param).then { +FakeAPI().testInlineAdditionalProperties(param: param).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -579,7 +579,7 @@ No authorization required # **testJsonFormData** ```swift - open class func testJsonFormData( param: String, param2: String) -> Promise + open func testJsonFormData( param: String, param2: String) -> Promise ``` test json serialization of form data @@ -593,7 +593,7 @@ let param = "param_example" // String | field1 let param2 = "param2_example" // String | field2 // test json serialization of form data -FakeAPI.testJsonFormData(param: param, param2: param2).then { +FakeAPI().testJsonFormData(param: param, param2: param2).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected diff --git a/samples/client/petstore/swift5/promisekitLibrary/docs/FakeClassnameTags123API.md b/samples/client/petstore/swift5/promisekitLibrary/docs/FakeClassnameTags123API.md index 38f9ac038734..0970721dbace 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/docs/FakeClassnameTags123API.md +++ b/samples/client/petstore/swift5/promisekitLibrary/docs/FakeClassnameTags123API.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **testClassname** ```swift - open class func testClassname( body: Client) -> Promise + open func testClassname( body: Client) -> Promise ``` To test class name in snake case @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test class name in snake case -FakeClassnameTags123API.testClassname(body: body).then { +FakeClassnameTags123API().testClassname(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected diff --git a/samples/client/petstore/swift5/promisekitLibrary/docs/PetAPI.md b/samples/client/petstore/swift5/promisekitLibrary/docs/PetAPI.md index 73755de2c49a..55872c0cf995 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/docs/PetAPI.md +++ b/samples/client/petstore/swift5/promisekitLibrary/docs/PetAPI.md @@ -17,7 +17,7 @@ Method | HTTP request | Description # **addPet** ```swift - open class func addPet( body: Pet) -> Promise + open func addPet( body: Pet) -> Promise ``` Add a new pet to the store @@ -30,7 +30,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Add a new pet to the store -PetAPI.addPet(body: body).then { +PetAPI().addPet(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -62,7 +62,7 @@ Void (empty response body) # **deletePet** ```swift - open class func deletePet( petId: Int64, apiKey: String? = nil) -> Promise + open func deletePet( petId: Int64, apiKey: String? = nil) -> Promise ``` Deletes a pet @@ -76,7 +76,7 @@ let petId = 987 // Int64 | Pet id to delete let apiKey = "apiKey_example" // String | (optional) // Deletes a pet -PetAPI.deletePet(petId: petId, apiKey: apiKey).then { +PetAPI().deletePet(petId: petId, apiKey: apiKey).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -109,7 +109,7 @@ Void (empty response body) # **findPetsByStatus** ```swift - open class func findPetsByStatus( status: [Status_findPetsByStatus]) -> Promise<[Pet]> + open func findPetsByStatus( status: [Status_findPetsByStatus]) -> Promise<[Pet]> ``` Finds Pets by status @@ -124,7 +124,7 @@ import PetstoreClient let status = ["status_example"] // [String] | Status values that need to be considered for filter // Finds Pets by status -PetAPI.findPetsByStatus(status: status).then { +PetAPI().findPetsByStatus(status: status).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -156,7 +156,7 @@ Name | Type | Description | Notes # **findPetsByTags** ```swift - open class func findPetsByTags( tags: [String]) -> Promise<[Pet]> + open func findPetsByTags( tags: [String]) -> Promise<[Pet]> ``` Finds Pets by tags @@ -171,7 +171,7 @@ import PetstoreClient let tags = ["inner_example"] // [String] | Tags to filter by // Finds Pets by tags -PetAPI.findPetsByTags(tags: tags).then { +PetAPI().findPetsByTags(tags: tags).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -203,7 +203,7 @@ Name | Type | Description | Notes # **getPetById** ```swift - open class func getPetById( petId: Int64) -> Promise + open func getPetById( petId: Int64) -> Promise ``` Find pet by ID @@ -218,7 +218,7 @@ import PetstoreClient let petId = 987 // Int64 | ID of pet to return // Find pet by ID -PetAPI.getPetById(petId: petId).then { +PetAPI().getPetById(petId: petId).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -250,7 +250,7 @@ Name | Type | Description | Notes # **updatePet** ```swift - open class func updatePet( body: Pet) -> Promise + open func updatePet( body: Pet) -> Promise ``` Update an existing pet @@ -263,7 +263,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Update an existing pet -PetAPI.updatePet(body: body).then { +PetAPI().updatePet(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -295,7 +295,7 @@ Void (empty response body) # **updatePetWithForm** ```swift - open class func updatePetWithForm( petId: Int64, name: String? = nil, status: String? = nil) -> Promise + open func updatePetWithForm( petId: Int64, name: String? = nil, status: String? = nil) -> Promise ``` Updates a pet in the store with form data @@ -310,7 +310,7 @@ let name = "name_example" // String | Updated name of the pet (optional) let status = "status_example" // String | Updated status of the pet (optional) // Updates a pet in the store with form data -PetAPI.updatePetWithForm(petId: petId, name: name, status: status).then { +PetAPI().updatePetWithForm(petId: petId, name: name, status: status).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -344,7 +344,7 @@ Void (empty response body) # **uploadFile** ```swift - open class func uploadFile( petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> Promise + open func uploadFile( petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> Promise ``` uploads an image @@ -359,7 +359,7 @@ let additionalMetadata = "additionalMetadata_example" // String | Additional dat let file = URL(string: "https://example.com")! // URL | file to upload (optional) // uploads an image -PetAPI.uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file).then { +PetAPI().uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -393,7 +393,7 @@ Name | Type | Description | Notes # **uploadFileWithRequiredFile** ```swift - open class func uploadFileWithRequiredFile( petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> Promise + open func uploadFileWithRequiredFile( petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> Promise ``` uploads an image (required) @@ -408,7 +408,7 @@ let requiredFile = URL(string: "https://example.com")! // URL | file to upload let additionalMetadata = "additionalMetadata_example" // String | Additional data to pass to server (optional) // uploads an image (required) -PetAPI.uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).then { +PetAPI().uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected diff --git a/samples/client/petstore/swift5/promisekitLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/promisekitLibrary/docs/StoreAPI.md index 662f1cf5b036..62d79874632c 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/docs/StoreAPI.md +++ b/samples/client/petstore/swift5/promisekitLibrary/docs/StoreAPI.md @@ -12,7 +12,7 @@ Method | HTTP request | Description # **deleteOrder** ```swift - open class func deleteOrder( orderId: String) -> Promise + open func deleteOrder( orderId: String) -> Promise ``` Delete purchase order by ID @@ -27,7 +27,7 @@ import PetstoreClient let orderId = "orderId_example" // String | ID of the order that needs to be deleted // Delete purchase order by ID -StoreAPI.deleteOrder(orderId: orderId).then { +StoreAPI().deleteOrder(orderId: orderId).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -59,7 +59,7 @@ No authorization required # **getInventory** ```swift - open class func getInventory() -> Promise<[String: Int]> + open func getInventory() -> Promise<[String: Int]> ``` Returns pet inventories by status @@ -73,7 +73,7 @@ import PetstoreClient // Returns pet inventories by status -StoreAPI.getInventory().then { +StoreAPI().getInventory().then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -102,7 +102,7 @@ This endpoint does not need any parameter. # **getOrderById** ```swift - open class func getOrderById( orderId: Int64) -> Promise + open func getOrderById( orderId: Int64) -> Promise ``` Find purchase order by ID @@ -117,7 +117,7 @@ import PetstoreClient let orderId = 987 // Int64 | ID of pet that needs to be fetched // Find purchase order by ID -StoreAPI.getOrderById(orderId: orderId).then { +StoreAPI().getOrderById(orderId: orderId).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -149,7 +149,7 @@ No authorization required # **placeOrder** ```swift - open class func placeOrder( body: Order) -> Promise + open func placeOrder( body: Order) -> Promise ``` Place an order for a pet @@ -162,7 +162,7 @@ import PetstoreClient let body = Order(id: 123, petId: 123, quantity: 123, shipDate: Date(), status: "status_example", complete: false) // Order | order placed for purchasing the pet // Place an order for a pet -StoreAPI.placeOrder(body: body).then { +StoreAPI().placeOrder(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected diff --git a/samples/client/petstore/swift5/promisekitLibrary/docs/UserAPI.md b/samples/client/petstore/swift5/promisekitLibrary/docs/UserAPI.md index 39efffd2bafa..5c7285a62780 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/docs/UserAPI.md +++ b/samples/client/petstore/swift5/promisekitLibrary/docs/UserAPI.md @@ -16,7 +16,7 @@ Method | HTTP request | Description # **createUser** ```swift - open class func createUser( body: User) -> Promise + open func createUser( body: User) -> Promise ``` Create user @@ -31,7 +31,7 @@ import PetstoreClient let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Created user object // Create user -UserAPI.createUser(body: body).then { +UserAPI().createUser(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -63,7 +63,7 @@ No authorization required # **createUsersWithArrayInput** ```swift - open class func createUsersWithArrayInput( body: [User]) -> Promise + open func createUsersWithArrayInput( body: [User]) -> Promise ``` Creates list of users with given input array @@ -76,7 +76,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithArrayInput(body: body).then { +UserAPI().createUsersWithArrayInput(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -108,7 +108,7 @@ No authorization required # **createUsersWithListInput** ```swift - open class func createUsersWithListInput( body: [User]) -> Promise + open func createUsersWithListInput( body: [User]) -> Promise ``` Creates list of users with given input array @@ -121,7 +121,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithListInput(body: body).then { +UserAPI().createUsersWithListInput(body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -153,7 +153,7 @@ No authorization required # **deleteUser** ```swift - open class func deleteUser( username: String) -> Promise + open func deleteUser( username: String) -> Promise ``` Delete user @@ -168,7 +168,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be deleted // Delete user -UserAPI.deleteUser(username: username).then { +UserAPI().deleteUser(username: username).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -200,7 +200,7 @@ No authorization required # **getUserByName** ```swift - open class func getUserByName( username: String) -> Promise + open func getUserByName( username: String) -> Promise ``` Get user by user name @@ -213,7 +213,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be fetched. Use user1 for testing. // Get user by user name -UserAPI.getUserByName(username: username).then { +UserAPI().getUserByName(username: username).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -245,7 +245,7 @@ No authorization required # **loginUser** ```swift - open class func loginUser( username: String, password: String) -> Promise + open func loginUser( username: String, password: String) -> Promise ``` Logs user into the system @@ -259,7 +259,7 @@ let username = "username_example" // String | The user name for login let password = "password_example" // String | The password for login in clear text // Logs user into the system -UserAPI.loginUser(username: username, password: password).then { +UserAPI().loginUser(username: username, password: password).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -292,7 +292,7 @@ No authorization required # **logoutUser** ```swift - open class func logoutUser() -> Promise + open func logoutUser() -> Promise ``` Logs out current logged in user session @@ -304,7 +304,7 @@ import PetstoreClient // Logs out current logged in user session -UserAPI.logoutUser().then { +UserAPI().logoutUser().then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected @@ -333,7 +333,7 @@ No authorization required # **updateUser** ```swift - open class func updateUser( username: String, body: User) -> Promise + open func updateUser( username: String, body: User) -> Promise ``` Updated user @@ -349,7 +349,7 @@ let username = "username_example" // String | name that need to be deleted let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Updated user object // Updated user -UserAPI.updateUser(username: username, body: body).then { +UserAPI().updateUser(username: username, body: body).then { // when the promise is fulfilled }.always { // regardless of whether the promise is fulfilled, or rejected diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 774626d6fa9d..89ae75ded436 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -28,15 +28,13 @@ internal class RequestBuilder { /// Optional block to obtain a reference to the request's progress instance when available. internal var onProgressReady: ((Progress) -> Void)? - required internal init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required internal init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders(PetstoreClientAPI.customHeaders) - addCredential() + self.credential = credential } internal func addHeaders(_ aHeaders: [String: String]) { @@ -57,8 +55,8 @@ internal class RequestBuilder { return self } - internal func addCredential() { - credential = PetstoreClientAPI.credential + internal func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index 1a55e93d802d..b5c84433981b 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif internal class AnotherFakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + internal init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test special tags @@ -20,7 +39,7 @@ internal class AnotherFakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -38,9 +57,9 @@ internal class AnotherFakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - internal class func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { + internal func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/another-fake/dummy" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -49,10 +68,13 @@ internal class AnotherFakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index 88f9dd49fb02..a18c3b7d8517 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif internal class FakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + internal init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** @@ -19,7 +38,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -36,9 +55,9 @@ internal class FakeAPI { - parameter body: (body) Input boolean as post body (optional) - returns: RequestBuilder */ - internal class func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { + internal func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/boolean" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -47,11 +66,14 @@ internal class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -61,7 +83,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -78,9 +100,9 @@ internal class FakeAPI { - parameter body: (body) Input composite as post body (optional) - returns: RequestBuilder */ - internal class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { + internal func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/composite" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -89,11 +111,14 @@ internal class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -103,7 +128,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -120,9 +145,9 @@ internal class FakeAPI { - parameter body: (body) Input number as post body (optional) - returns: RequestBuilder */ - internal class func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { + internal func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/number" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -131,11 +156,14 @@ internal class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -145,7 +173,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -162,9 +190,9 @@ internal class FakeAPI { - parameter body: (body) Input string as post body (optional) - returns: RequestBuilder */ - internal class func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { + internal func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/string" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -173,11 +201,14 @@ internal class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -187,7 +218,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -204,9 +235,9 @@ internal class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - internal class func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { + internal func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { let localVariablePath = "/fake/body-with-file-schema" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -215,11 +246,14 @@ internal class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -230,7 +264,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -247,9 +281,9 @@ internal class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - internal class func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { + internal func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { let localVariablePath = "/fake/body-with-query-params" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -261,11 +295,14 @@ internal class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -276,7 +313,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -294,9 +331,9 @@ internal class FakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - internal class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { + internal func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -305,11 +342,14 @@ internal class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -333,7 +373,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func testEndpointParameters(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double, string: String? = nil, patternWithoutDelimiter: String, byte: Data, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func testEndpointParameters(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double, string: String? = nil, patternWithoutDelimiter: String, byte: Data, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return testEndpointParametersWithRequestBuilder(integer: integer, int32: int32, int64: int64, number: number, float: float, double: double, string: string, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result in switch result { case .success: @@ -367,9 +407,9 @@ internal class FakeAPI { - parameter callback: (form) None (optional) - returns: RequestBuilder */ - internal class func testEndpointParametersWithRequestBuilder(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double, string: String? = nil, patternWithoutDelimiter: String, byte: Data, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { + internal func testEndpointParametersWithRequestBuilder(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double, string: String? = nil, patternWithoutDelimiter: String, byte: Data, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "integer": integer?.encodeToJSON(), "int32": int32?.encodeToJSON(), @@ -396,11 +436,14 @@ internal class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -485,7 +528,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result in switch result { case .success: @@ -510,9 +553,9 @@ internal class FakeAPI { - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: RequestBuilder */ - internal class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { + internal func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "enum_form_string_array": enumFormStringArray?.encodeToJSON(), "enum_form_string": enumFormString?.encodeToJSON(), @@ -535,11 +578,14 @@ internal class FakeAPI { "enum_header_string": enumHeaderString?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -555,7 +601,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result in switch result { case .success: @@ -578,9 +624,9 @@ internal class FakeAPI { - parameter int64Group: (query) Integer in group parameters (optional) - returns: RequestBuilder */ - internal class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { + internal func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -596,11 +642,14 @@ internal class FakeAPI { "boolean_group": booleanGroup?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -611,7 +660,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result in switch result { case .success: @@ -628,9 +677,9 @@ internal class FakeAPI { - parameter param: (body) request body - returns: RequestBuilder */ - internal class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { + internal func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { let localVariablePath = "/fake/inline-additionalProperties" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -639,11 +688,14 @@ internal class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -655,7 +707,7 @@ internal class FakeAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result in switch result { case .success: @@ -673,9 +725,9 @@ internal class FakeAPI { - parameter param2: (form) field2 - returns: RequestBuilder */ - internal class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { + internal func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "param": param.encodeToJSON(), "param2": param2.encodeToJSON(), @@ -690,10 +742,13 @@ internal class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index 07cc7e4f8779..24358f08bc4f 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif internal class FakeClassnameTags123API { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + internal init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test class name in snake case @@ -20,7 +39,7 @@ internal class FakeClassnameTags123API { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -41,9 +60,9 @@ internal class FakeClassnameTags123API { - parameter body: (body) client model - returns: RequestBuilder */ - internal class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { + internal func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake_classname_test" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -52,10 +71,13 @@ internal class FakeClassnameTags123API { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index 9c18968b6567..54dde6cf4087 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif internal class PetAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + internal init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Add a new pet to the store @@ -20,7 +39,7 @@ internal class PetAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -43,9 +62,9 @@ internal class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - internal class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { + internal func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -54,11 +73,14 @@ internal class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -70,7 +92,7 @@ internal class PetAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func deletePet(apiKey: String? = nil, petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func deletePet(apiKey: String? = nil, petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return deletePetWithRequestBuilder(apiKey: apiKey, petId: petId).execute(apiResponseQueue) { result in switch result { case .success: @@ -91,12 +113,12 @@ internal class PetAPI { - parameter petId: (path) Pet id to delete - returns: RequestBuilder */ - internal class func deletePetWithRequestBuilder(apiKey: String? = nil, petId: Int64) -> RequestBuilder { + internal func deletePetWithRequestBuilder(apiKey: String? = nil, petId: Int64) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -105,11 +127,14 @@ internal class PetAPI { "api_key": apiKey?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -129,7 +154,7 @@ internal class PetAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<[Pet], ErrorResponse>) -> Void)) -> RequestTask { + internal func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<[Pet], ErrorResponse>) -> Void)) -> RequestTask { return findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -150,9 +175,9 @@ internal class PetAPI { - parameter status: (query) Status values that need to be considered for filter - returns: RequestBuilder<[Pet]> */ - internal class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { + internal func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -164,11 +189,14 @@ internal class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -180,7 +208,7 @@ internal class PetAPI { */ @available(*, deprecated, message: "This operation is deprecated.") @discardableResult - internal class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<[Pet], ErrorResponse>) -> Void)) -> RequestTask { + internal func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<[Pet], ErrorResponse>) -> Void)) -> RequestTask { return findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -202,9 +230,9 @@ internal class PetAPI { - returns: RequestBuilder<[Pet]> */ @available(*, deprecated, message: "This operation is deprecated.") - internal class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { + internal func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -216,11 +244,14 @@ internal class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -231,7 +262,7 @@ internal class PetAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -252,12 +283,12 @@ internal class PetAPI { - parameter petId: (path) ID of pet to return - returns: RequestBuilder */ - internal class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { + internal func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -266,11 +297,14 @@ internal class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -281,7 +315,7 @@ internal class PetAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -301,9 +335,9 @@ internal class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - internal class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { + internal func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -312,11 +346,14 @@ internal class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -329,7 +366,7 @@ internal class PetAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result in switch result { case .success: @@ -351,12 +388,12 @@ internal class PetAPI { - parameter status: (form) Updated status of the pet (optional) - returns: RequestBuilder */ - internal class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { + internal func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "name": name?.encodeToJSON(), "status": status?.encodeToJSON(), @@ -371,11 +408,14 @@ internal class PetAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -388,7 +428,7 @@ internal class PetAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -410,12 +450,12 @@ internal class PetAPI { - parameter file: (form) file to upload (optional) - returns: RequestBuilder */ - internal class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { + internal func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}/uploadImage" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "file": file?.encodeToJSON(), @@ -430,11 +470,14 @@ internal class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -447,7 +490,7 @@ internal class PetAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func uploadFileWithRequiredFile(petId: Int64, additionalMetadata: String? = nil, requiredFile: URL, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func uploadFileWithRequiredFile(petId: Int64, additionalMetadata: String? = nil, requiredFile: URL, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return uploadFileWithRequiredFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, requiredFile: requiredFile).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -469,12 +512,12 @@ internal class PetAPI { - parameter requiredFile: (form) file to upload - returns: RequestBuilder */ - internal class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, requiredFile: URL) -> RequestBuilder { + internal func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, requiredFile: URL) -> RequestBuilder { var localVariablePath = "/fake/{petId}/uploadImageWithRequiredFile" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "requiredFile": requiredFile.encodeToJSON(), @@ -489,10 +532,13 @@ internal class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index 9943aca53a99..394d1cf0a17b 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif internal class StoreAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + internal init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Delete purchase order by ID @@ -20,7 +39,7 @@ internal class StoreAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case .success: @@ -38,12 +57,12 @@ internal class StoreAPI { - parameter orderId: (path) ID of the order that needs to be deleted - returns: RequestBuilder */ - internal class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { + internal func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -52,11 +71,14 @@ internal class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -66,7 +88,7 @@ internal class StoreAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<[String: Int], ErrorResponse>) -> Void)) -> RequestTask { + internal func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<[String: Int], ErrorResponse>) -> Void)) -> RequestTask { return getInventoryWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -86,9 +108,9 @@ internal class StoreAPI { - name: api_key - returns: RequestBuilder<[String: Int]> */ - internal class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { + internal func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -97,11 +119,14 @@ internal class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -112,7 +137,7 @@ internal class StoreAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -130,12 +155,12 @@ internal class StoreAPI { - parameter orderId: (path) ID of pet that needs to be fetched - returns: RequestBuilder */ - internal class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { + internal func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -144,11 +169,14 @@ internal class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -159,7 +187,7 @@ internal class StoreAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -176,9 +204,9 @@ internal class StoreAPI { - parameter body: (body) order placed for purchasing the pet - returns: RequestBuilder */ - internal class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { + internal func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { let localVariablePath = "/store/order" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -187,10 +215,13 @@ internal class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index ca6bcf255495..3b4586328e48 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif internal class UserAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + internal init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Create user @@ -20,7 +39,7 @@ internal class UserAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -38,9 +57,9 @@ internal class UserAPI { - parameter body: (body) Created user object - returns: RequestBuilder */ - internal class func createUserWithRequestBuilder(body: User) -> RequestBuilder { + internal func createUserWithRequestBuilder(body: User) -> RequestBuilder { let localVariablePath = "/user" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -49,11 +68,14 @@ internal class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -64,7 +86,7 @@ internal class UserAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -81,9 +103,9 @@ internal class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - internal class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { + internal func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithArray" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -92,11 +114,14 @@ internal class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -107,7 +132,7 @@ internal class UserAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -124,9 +149,9 @@ internal class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - internal class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { + internal func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithList" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -135,11 +160,14 @@ internal class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -150,7 +178,7 @@ internal class UserAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case .success: @@ -168,12 +196,12 @@ internal class UserAPI { - parameter username: (path) The name that needs to be deleted - returns: RequestBuilder */ - internal class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { + internal func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -182,11 +210,14 @@ internal class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -197,7 +228,7 @@ internal class UserAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -214,12 +245,12 @@ internal class UserAPI { - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: RequestBuilder */ - internal class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { + internal func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -228,11 +259,14 @@ internal class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -244,7 +278,7 @@ internal class UserAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -263,9 +297,9 @@ internal class UserAPI { - parameter password: (query) The password for login in clear text - returns: RequestBuilder */ - internal class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { + internal func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { let localVariablePath = "/user/login" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -278,11 +312,14 @@ internal class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -292,7 +329,7 @@ internal class UserAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return logoutUserWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case .success: @@ -308,9 +345,9 @@ internal class UserAPI { - GET /user/logout - returns: RequestBuilder */ - internal class func logoutUserWithRequestBuilder() -> RequestBuilder { + internal func logoutUserWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/user/logout" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -319,11 +356,14 @@ internal class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -335,7 +375,7 @@ internal class UserAPI { - parameter completion: completion handler to receive the result */ @discardableResult - internal class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { + internal func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result) -> Void)) -> RequestTask { return updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -354,12 +394,12 @@ internal class UserAPI { - parameter body: (body) Updated user object - returns: RequestBuilder */ - internal class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { + internal func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -368,10 +408,13 @@ internal class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index a76ea20537dd..4a6e61c8ae48 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -71,8 +71,8 @@ internal class URLSessionRequestBuilder: RequestBuilder { */ internal var taskDidReceiveChallenge: PetstoreClientAPIChallengeHandler? - required internal init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required internal init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/resultLibrary/docs/AnotherFakeAPI.md b/samples/client/petstore/swift5/resultLibrary/docs/AnotherFakeAPI.md index 4477db083ea3..d3fd55c8ae42 100644 --- a/samples/client/petstore/swift5/resultLibrary/docs/AnotherFakeAPI.md +++ b/samples/client/petstore/swift5/resultLibrary/docs/AnotherFakeAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **call123testSpecialTags** ```swift - internal class func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + internal func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test special tags @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test special tags -AnotherFakeAPI.call123testSpecialTags(body: body) { (response, error) in +AnotherFakeAPI().call123testSpecialTags(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/resultLibrary/docs/FakeAPI.md b/samples/client/petstore/swift5/resultLibrary/docs/FakeAPI.md index 1cc75c5aab2c..5604b1b77c91 100644 --- a/samples/client/petstore/swift5/resultLibrary/docs/FakeAPI.md +++ b/samples/client/petstore/swift5/resultLibrary/docs/FakeAPI.md @@ -20,7 +20,7 @@ Method | HTTP request | Description # **fakeOuterBooleanSerialize** ```swift - internal class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) + internal func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) ``` @@ -34,7 +34,7 @@ import PetstoreClient let body = true // Bool | Input boolean as post body (optional) -FakeAPI.fakeOuterBooleanSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterBooleanSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -69,7 +69,7 @@ No authorization required # **fakeOuterCompositeSerialize** ```swift - internal class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) + internal func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) ``` @@ -83,7 +83,7 @@ import PetstoreClient let body = OuterComposite(myNumber: 123, myString: "myString_example", myBoolean: false) // OuterComposite | Input composite as post body (optional) -FakeAPI.fakeOuterCompositeSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterCompositeSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -118,7 +118,7 @@ No authorization required # **fakeOuterNumberSerialize** ```swift - internal class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) + internal func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) ``` @@ -132,7 +132,7 @@ import PetstoreClient let body = 987 // Double | Input number as post body (optional) -FakeAPI.fakeOuterNumberSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterNumberSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -167,7 +167,7 @@ No authorization required # **fakeOuterStringSerialize** ```swift - internal class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + internal func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` @@ -181,7 +181,7 @@ import PetstoreClient let body = "body_example" // String | Input string as post body (optional) -FakeAPI.fakeOuterStringSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterStringSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -216,7 +216,7 @@ No authorization required # **testBodyWithFileSchema** ```swift - internal class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -230,7 +230,7 @@ import PetstoreClient let body = FileSchemaTestClass(file: File(sourceURI: "sourceURI_example"), files: [nil]) // FileSchemaTestClass | -FakeAPI.testBodyWithFileSchema(body: body) { (response, error) in +FakeAPI().testBodyWithFileSchema(body: body) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ No authorization required # **testBodyWithQueryParams** ```swift - internal class func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -278,7 +278,7 @@ import PetstoreClient let query = "query_example" // String | let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | -FakeAPI.testBodyWithQueryParams(query: query, body: body) { (response, error) in +FakeAPI().testBodyWithQueryParams(query: query, body: body) { (response, error) in guard error == nil else { print(error) return @@ -314,7 +314,7 @@ No authorization required # **testClientModel** ```swift - internal class func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + internal func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test \"client\" model @@ -329,7 +329,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test \"client\" model -FakeAPI.testClientModel(body: body) { (response, error) in +FakeAPI().testClientModel(body: body) { (response, error) in guard error == nil else { print(error) return @@ -364,7 +364,7 @@ No authorization required # **testEndpointParameters** ```swift - internal class func testEndpointParameters(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double, string: String? = nil, patternWithoutDelimiter: String, byte: Data, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func testEndpointParameters(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double, string: String? = nil, patternWithoutDelimiter: String, byte: Data, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -392,7 +392,7 @@ let password = "password_example" // String | None (optional) let callback = "callback_example" // String | None (optional) // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 -FakeAPI.testEndpointParameters(integer: integer, int32: int32, int64: int64, number: number, float: float, double: double, string: string, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in +FakeAPI().testEndpointParameters(integer: integer, int32: int32, int64: int64, number: number, float: float, double: double, string: string, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in guard error == nil else { print(error) return @@ -440,7 +440,7 @@ Void (empty response body) # **testEnumParameters** ```swift - internal class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` To test enum parameters @@ -462,7 +462,7 @@ let enumFormStringArray = ["inner_example"] // [String] | Form parameter enum te let enumFormString = "enumFormString_example" // String | Form parameter enum test (string) (optional) (default to .efg) // To test enum parameters -FakeAPI.testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in +FakeAPI().testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in guard error == nil else { print(error) return @@ -504,7 +504,7 @@ No authorization required # **testGroupParameters** ```swift - internal class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint to test group parameters (optional) @@ -524,7 +524,7 @@ let booleanGroup = true // Bool | Boolean in group parameters (optional) let int64Group = 987 // Int64 | Integer in group parameters (optional) // Fake endpoint to test group parameters (optional) -FakeAPI.testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in +FakeAPI().testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in guard error == nil else { print(error) return @@ -564,7 +564,7 @@ No authorization required # **testInlineAdditionalProperties** ```swift - internal class func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test inline additionalProperties @@ -577,7 +577,7 @@ import PetstoreClient let param = "TODO" // [String: String] | request body // test inline additionalProperties -FakeAPI.testInlineAdditionalProperties(param: param) { (response, error) in +FakeAPI().testInlineAdditionalProperties(param: param) { (response, error) in guard error == nil else { print(error) return @@ -612,7 +612,7 @@ No authorization required # **testJsonFormData** ```swift - internal class func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test json serialization of form data @@ -626,7 +626,7 @@ let param = "param_example" // String | field1 let param2 = "param2_example" // String | field2 // test json serialization of form data -FakeAPI.testJsonFormData(param: param, param2: param2) { (response, error) in +FakeAPI().testJsonFormData(param: param, param2: param2) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/resultLibrary/docs/FakeClassnameTags123API.md b/samples/client/petstore/swift5/resultLibrary/docs/FakeClassnameTags123API.md index fbceb57f20ef..ca87f5949383 100644 --- a/samples/client/petstore/swift5/resultLibrary/docs/FakeClassnameTags123API.md +++ b/samples/client/petstore/swift5/resultLibrary/docs/FakeClassnameTags123API.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **testClassname** ```swift - internal class func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + internal func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test class name in snake case @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test class name in snake case -FakeClassnameTags123API.testClassname(body: body) { (response, error) in +FakeClassnameTags123API().testClassname(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/resultLibrary/docs/PetAPI.md b/samples/client/petstore/swift5/resultLibrary/docs/PetAPI.md index 5d22a913fc65..c41729d567ef 100644 --- a/samples/client/petstore/swift5/resultLibrary/docs/PetAPI.md +++ b/samples/client/petstore/swift5/resultLibrary/docs/PetAPI.md @@ -17,7 +17,7 @@ Method | HTTP request | Description # **addPet** ```swift - internal class func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Add a new pet to the store @@ -30,7 +30,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Add a new pet to the store -PetAPI.addPet(body: body) { (response, error) in +PetAPI().addPet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -65,7 +65,7 @@ Void (empty response body) # **deletePet** ```swift - internal class func deletePet(apiKey: String? = nil, petId: Int64, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func deletePet(apiKey: String? = nil, petId: Int64, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Deletes a pet @@ -79,7 +79,7 @@ let apiKey = "apiKey_example" // String | (optional) let petId = 987 // Int64 | Pet id to delete // Deletes a pet -PetAPI.deletePet(apiKey: apiKey, petId: petId) { (response, error) in +PetAPI().deletePet(apiKey: apiKey, petId: petId) { (response, error) in guard error == nil else { print(error) return @@ -115,7 +115,7 @@ Void (empty response body) # **findPetsByStatus** ```swift - internal class func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + internal func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by status @@ -130,7 +130,7 @@ import PetstoreClient let status = ["status_example"] // [String] | Status values that need to be considered for filter // Finds Pets by status -PetAPI.findPetsByStatus(status: status) { (response, error) in +PetAPI().findPetsByStatus(status: status) { (response, error) in guard error == nil else { print(error) return @@ -165,7 +165,7 @@ Name | Type | Description | Notes # **findPetsByTags** ```swift - internal class func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + internal func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by tags @@ -180,7 +180,7 @@ import PetstoreClient let tags = ["inner_example"] // [String] | Tags to filter by // Finds Pets by tags -PetAPI.findPetsByTags(tags: tags) { (response, error) in +PetAPI().findPetsByTags(tags: tags) { (response, error) in guard error == nil else { print(error) return @@ -215,7 +215,7 @@ Name | Type | Description | Notes # **getPetById** ```swift - internal class func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) + internal func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) ``` Find pet by ID @@ -230,7 +230,7 @@ import PetstoreClient let petId = 987 // Int64 | ID of pet to return // Find pet by ID -PetAPI.getPetById(petId: petId) { (response, error) in +PetAPI().getPetById(petId: petId) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ Name | Type | Description | Notes # **updatePet** ```swift - internal class func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Update an existing pet @@ -278,7 +278,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Update an existing pet -PetAPI.updatePet(body: body) { (response, error) in +PetAPI().updatePet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -313,7 +313,7 @@ Void (empty response body) # **updatePetWithForm** ```swift - internal class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updates a pet in the store with form data @@ -328,7 +328,7 @@ let name = "name_example" // String | Updated name of the pet (optional) let status = "status_example" // String | Updated status of the pet (optional) // Updates a pet in the store with form data -PetAPI.updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in +PetAPI().updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in guard error == nil else { print(error) return @@ -365,7 +365,7 @@ Void (empty response body) # **uploadFile** ```swift - internal class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + internal func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image @@ -380,7 +380,7 @@ let additionalMetadata = "additionalMetadata_example" // String | Additional dat let file = URL(string: "https://example.com")! // URL | file to upload (optional) // uploads an image -PetAPI.uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in +PetAPI().uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in guard error == nil else { print(error) return @@ -417,7 +417,7 @@ Name | Type | Description | Notes # **uploadFileWithRequiredFile** ```swift - internal class func uploadFileWithRequiredFile(petId: Int64, additionalMetadata: String? = nil, requiredFile: URL, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + internal func uploadFileWithRequiredFile(petId: Int64, additionalMetadata: String? = nil, requiredFile: URL, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image (required) @@ -432,7 +432,7 @@ let additionalMetadata = "additionalMetadata_example" // String | Additional dat let requiredFile = URL(string: "https://example.com")! // URL | file to upload // uploads an image (required) -PetAPI.uploadFileWithRequiredFile(petId: petId, additionalMetadata: additionalMetadata, requiredFile: requiredFile) { (response, error) in +PetAPI().uploadFileWithRequiredFile(petId: petId, additionalMetadata: additionalMetadata, requiredFile: requiredFile) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/resultLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/resultLibrary/docs/StoreAPI.md index 37b5e1142165..8b7903e73104 100644 --- a/samples/client/petstore/swift5/resultLibrary/docs/StoreAPI.md +++ b/samples/client/petstore/swift5/resultLibrary/docs/StoreAPI.md @@ -12,7 +12,7 @@ Method | HTTP request | Description # **deleteOrder** ```swift - internal class func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete purchase order by ID @@ -27,7 +27,7 @@ import PetstoreClient let orderId = "orderId_example" // String | ID of the order that needs to be deleted // Delete purchase order by ID -StoreAPI.deleteOrder(orderId: orderId) { (response, error) in +StoreAPI().deleteOrder(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -62,7 +62,7 @@ No authorization required # **getInventory** ```swift - internal class func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) + internal func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) ``` Returns pet inventories by status @@ -76,7 +76,7 @@ import PetstoreClient // Returns pet inventories by status -StoreAPI.getInventory() { (response, error) in +StoreAPI().getInventory() { (response, error) in guard error == nil else { print(error) return @@ -108,7 +108,7 @@ This endpoint does not need any parameter. # **getOrderById** ```swift - internal class func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + internal func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Find purchase order by ID @@ -123,7 +123,7 @@ import PetstoreClient let orderId = 987 // Int64 | ID of pet that needs to be fetched // Find purchase order by ID -StoreAPI.getOrderById(orderId: orderId) { (response, error) in +StoreAPI().getOrderById(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -158,7 +158,7 @@ No authorization required # **placeOrder** ```swift - internal class func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + internal func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Place an order for a pet @@ -171,7 +171,7 @@ import PetstoreClient let body = Order(id: 123, petId: 123, quantity: 123, shipDate: Date(), status: "status_example", complete: false) // Order | order placed for purchasing the pet // Place an order for a pet -StoreAPI.placeOrder(body: body) { (response, error) in +StoreAPI().placeOrder(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/resultLibrary/docs/UserAPI.md b/samples/client/petstore/swift5/resultLibrary/docs/UserAPI.md index fed69766b0f2..5f3efd18f957 100644 --- a/samples/client/petstore/swift5/resultLibrary/docs/UserAPI.md +++ b/samples/client/petstore/swift5/resultLibrary/docs/UserAPI.md @@ -16,7 +16,7 @@ Method | HTTP request | Description # **createUser** ```swift - internal class func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Create user @@ -31,7 +31,7 @@ import PetstoreClient let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Created user object // Create user -UserAPI.createUser(body: body) { (response, error) in +UserAPI().createUser(body: body) { (response, error) in guard error == nil else { print(error) return @@ -66,7 +66,7 @@ No authorization required # **createUsersWithArrayInput** ```swift - internal class func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -79,7 +79,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithArrayInput(body: body) { (response, error) in +UserAPI().createUsersWithArrayInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -114,7 +114,7 @@ No authorization required # **createUsersWithListInput** ```swift - internal class func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -127,7 +127,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithListInput(body: body) { (response, error) in +UserAPI().createUsersWithListInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -162,7 +162,7 @@ No authorization required # **deleteUser** ```swift - internal class func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete user @@ -177,7 +177,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be deleted // Delete user -UserAPI.deleteUser(username: username) { (response, error) in +UserAPI().deleteUser(username: username) { (response, error) in guard error == nil else { print(error) return @@ -212,7 +212,7 @@ No authorization required # **getUserByName** ```swift - internal class func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) + internal func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) ``` Get user by user name @@ -225,7 +225,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be fetched. Use user1 for testing. // Get user by user name -UserAPI.getUserByName(username: username) { (response, error) in +UserAPI().getUserByName(username: username) { (response, error) in guard error == nil else { print(error) return @@ -260,7 +260,7 @@ No authorization required # **loginUser** ```swift - internal class func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + internal func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` Logs user into the system @@ -274,7 +274,7 @@ let username = "username_example" // String | The user name for login let password = "password_example" // String | The password for login in clear text // Logs user into the system -UserAPI.loginUser(username: username, password: password) { (response, error) in +UserAPI().loginUser(username: username, password: password) { (response, error) in guard error == nil else { print(error) return @@ -310,7 +310,7 @@ No authorization required # **logoutUser** ```swift - internal class func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Logs out current logged in user session @@ -322,7 +322,7 @@ import PetstoreClient // Logs out current logged in user session -UserAPI.logoutUser() { (response, error) in +UserAPI().logoutUser() { (response, error) in guard error == nil else { print(error) return @@ -354,7 +354,7 @@ No authorization required # **updateUser** ```swift - internal class func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + internal func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updated user @@ -370,7 +370,7 @@ let username = "username_example" // String | name that need to be deleted let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Updated user object // Updated user -UserAPI.updateUser(username: username, body: body) { (response, error) in +UserAPI().updateUser(username: username, body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3ad11a871d5a..49426a6f123a 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -28,15 +28,13 @@ open class RequestBuilder { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders(PetstoreClientAPI.customHeaders) - addCredential() + self.credential = credential } open func addHeaders(_ aHeaders: [String: String]) { @@ -57,8 +55,8 @@ open class RequestBuilder { return self } - open func addCredential() { - credential = PetstoreClientAPI.credential + open func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift index fc3c578ad600..aa3ec6dd6b7e 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import RxSwift #if canImport(AnyCodable) import AnyCodable #endif open class AnotherFakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test special tags @@ -20,9 +39,11 @@ open class AnotherFakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -30,10 +51,13 @@ open class AnotherFakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -45,9 +69,9 @@ open class AnotherFakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { + open func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/another-fake/dummy" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -56,10 +80,13 @@ open class AnotherFakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index 03433120c1ab..f40897e29a70 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import RxSwift #if canImport(AnyCodable) import AnyCodable #endif open class FakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** @@ -19,9 +38,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -29,10 +50,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -43,9 +67,9 @@ open class FakeAPI { - parameter body: (body) Input boolean as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { + open func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/boolean" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -54,11 +78,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -67,9 +94,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -77,10 +106,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -91,9 +123,9 @@ open class FakeAPI { - parameter body: (body) Input composite as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { + open func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/composite" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -102,11 +134,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -115,9 +150,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -125,10 +162,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -139,9 +179,9 @@ open class FakeAPI { - parameter body: (body) Input number as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { + open func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/number" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -150,11 +190,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -163,9 +206,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -173,10 +218,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -187,9 +235,9 @@ open class FakeAPI { - parameter body: (body) Input string as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { + open func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/string" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -198,11 +246,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -211,9 +262,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -221,10 +274,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -235,9 +291,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { + open func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { let localVariablePath = "/fake/body-with-file-schema" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -246,11 +302,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -260,9 +319,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result in + open func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -270,10 +331,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -284,9 +348,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { + open func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { let localVariablePath = "/fake/body-with-query-params" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -298,11 +362,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -312,9 +379,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -322,10 +391,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -337,9 +409,9 @@ open class FakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -348,11 +420,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -375,9 +450,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result in + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -385,10 +462,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -416,9 +496,9 @@ open class FakeAPI { - parameter callback: (form) None (optional) - returns: RequestBuilder */ - open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { + open func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "integer": integer?.encodeToJSON(), "int32": int32?.encodeToJSON(), @@ -445,11 +525,14 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -533,9 +616,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result in + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -543,10 +628,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -565,9 +653,9 @@ open class FakeAPI { - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: RequestBuilder */ - open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { + open func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "enum_form_string_array": enumFormStringArray?.encodeToJSON(), "enum_form_string": enumFormString?.encodeToJSON(), @@ -590,11 +678,14 @@ open class FakeAPI { "enum_header_string": enumHeaderString?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -609,9 +700,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result in + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -619,10 +712,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -639,9 +735,9 @@ open class FakeAPI { - parameter int64Group: (query) Integer in group parameters (optional) - returns: RequestBuilder */ - open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { + open func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -657,11 +753,14 @@ open class FakeAPI { "boolean_group": booleanGroup?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -671,9 +770,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result in + open func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -681,10 +782,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -695,9 +799,9 @@ open class FakeAPI { - parameter param: (body) request body - returns: RequestBuilder */ - open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { + open func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { let localVariablePath = "/fake/inline-additionalProperties" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -706,11 +810,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -721,9 +828,11 @@ open class FakeAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result in + open func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -731,10 +840,13 @@ open class FakeAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -746,9 +858,9 @@ open class FakeAPI { - parameter param2: (form) field2 - returns: RequestBuilder */ - open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { + open func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "param": param.encodeToJSON(), "param2": param2.encodeToJSON(), @@ -763,10 +875,13 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift index c8366f282b25..113513daed5f 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import RxSwift #if canImport(AnyCodable) import AnyCodable #endif open class FakeClassnameTags123API { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test class name in snake case @@ -20,9 +39,11 @@ open class FakeClassnameTags123API { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -30,10 +51,13 @@ open class FakeClassnameTags123API { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -48,9 +72,9 @@ open class FakeClassnameTags123API { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake_classname_test" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -59,10 +83,13 @@ open class FakeClassnameTags123API { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift index 161cac524b57..a5a973649103 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import RxSwift #if canImport(AnyCodable) import AnyCodable #endif open class PetAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Add a new pet to the store @@ -20,9 +39,11 @@ open class PetAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -30,10 +51,13 @@ open class PetAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -50,9 +74,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -61,11 +85,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -76,9 +103,11 @@ open class PetAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result in + open func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -86,10 +115,13 @@ open class PetAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -104,12 +136,12 @@ open class PetAPI { - parameter apiKey: (header) (optional) - returns: RequestBuilder */ - open class func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { + open func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -118,11 +150,14 @@ open class PetAPI { "api_key": apiKey?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -141,9 +176,11 @@ open class PetAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable<[Pet]> */ - open class func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable<[Pet]> { - return Observable.create { observer -> Disposable in - let requestTask = findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result in + open func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable<[Pet]> { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -151,10 +188,13 @@ open class PetAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -169,9 +209,9 @@ open class PetAPI { - parameter status: (query) Status values that need to be considered for filter - returns: RequestBuilder<[Pet]> */ - open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { + open func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -183,11 +223,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -198,9 +241,11 @@ open class PetAPI { - returns: Observable<[Pet]> */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable<[Pet]> { - return Observable.create { observer -> Disposable in - let requestTask = findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result in + open func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable<[Pet]> { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -208,10 +253,13 @@ open class PetAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -227,9 +275,9 @@ open class PetAPI { - returns: RequestBuilder<[Pet]> */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { + open func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -241,11 +289,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -255,9 +306,11 @@ open class PetAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result in + open func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -265,10 +318,13 @@ open class PetAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -283,12 +339,12 @@ open class PetAPI { - parameter petId: (path) ID of pet to return - returns: RequestBuilder */ - open class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { + open func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -297,11 +353,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -311,9 +370,11 @@ open class PetAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -321,10 +382,13 @@ open class PetAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -338,9 +402,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -349,11 +413,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -365,9 +432,11 @@ open class PetAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result in + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -375,10 +444,13 @@ open class PetAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -394,12 +466,12 @@ open class PetAPI { - parameter status: (form) Updated status of the pet (optional) - returns: RequestBuilder */ - open class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { + open func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "name": name?.encodeToJSON(), "status": status?.encodeToJSON(), @@ -414,11 +486,14 @@ open class PetAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -430,9 +505,11 @@ open class PetAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result in + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -440,10 +517,13 @@ open class PetAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -459,12 +539,12 @@ open class PetAPI { - parameter file: (form) file to upload (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { + open func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}/uploadImage" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "file": file?.encodeToJSON(), @@ -479,11 +559,14 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -495,9 +578,11 @@ open class PetAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result in + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -505,10 +590,13 @@ open class PetAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -524,12 +612,12 @@ open class PetAPI { - parameter additionalMetadata: (form) Additional data to pass to server (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { + open func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { var localVariablePath = "/fake/{petId}/uploadImageWithRequiredFile" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "requiredFile": requiredFile.encodeToJSON(), @@ -544,10 +632,13 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift index 7a24e880f617..c2971e3dcdec 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import RxSwift #if canImport(AnyCodable) import AnyCodable #endif open class StoreAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Delete purchase order by ID @@ -20,9 +39,11 @@ open class StoreAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in + open func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -30,10 +51,13 @@ open class StoreAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -45,12 +69,12 @@ open class StoreAPI { - parameter orderId: (path) ID of the order that needs to be deleted - returns: RequestBuilder */ - open class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { + open func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -59,11 +83,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -72,9 +99,11 @@ open class StoreAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable<[String: Int]> */ - open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable<[String: Int]> { - return Observable.create { observer -> Disposable in - let requestTask = getInventoryWithRequestBuilder().execute(apiResponseQueue) { result in + open func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable<[String: Int]> { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = getInventoryWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -82,10 +111,13 @@ open class StoreAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -99,9 +131,9 @@ open class StoreAPI { - name: api_key - returns: RequestBuilder<[String: Int]> */ - open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { + open func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -110,11 +142,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -124,9 +159,11 @@ open class StoreAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in + open func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -134,10 +171,13 @@ open class StoreAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -149,12 +189,12 @@ open class StoreAPI { - parameter orderId: (path) ID of pet that needs to be fetched - returns: RequestBuilder */ - open class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { + open func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -163,11 +203,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -177,9 +220,11 @@ open class StoreAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -187,10 +232,13 @@ open class StoreAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -201,9 +249,9 @@ open class StoreAPI { - parameter body: (body) order placed for purchasing the pet - returns: RequestBuilder */ - open class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { + open func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { let localVariablePath = "/store/order" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -212,10 +260,13 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift index 9ab47031b60f..aead285b200c 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import RxSwift #if canImport(AnyCodable) import AnyCodable #endif open class UserAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Create user @@ -20,9 +39,11 @@ open class UserAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -30,10 +51,13 @@ open class UserAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -45,9 +69,9 @@ open class UserAPI { - parameter body: (body) Created user object - returns: RequestBuilder */ - open class func createUserWithRequestBuilder(body: User) -> RequestBuilder { + open func createUserWithRequestBuilder(body: User) -> RequestBuilder { let localVariablePath = "/user" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -56,11 +80,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -70,9 +97,11 @@ open class UserAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -80,10 +109,13 @@ open class UserAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -94,9 +126,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithArray" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -105,11 +137,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -119,9 +154,11 @@ open class UserAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in + open func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -129,10 +166,13 @@ open class UserAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -143,9 +183,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithList" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -154,11 +194,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -168,9 +211,11 @@ open class UserAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result in + open func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -178,10 +223,13 @@ open class UserAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -193,12 +241,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be deleted - returns: RequestBuilder */ - open class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { + open func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -207,11 +255,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -221,9 +272,11 @@ open class UserAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result in + open func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -231,10 +284,13 @@ open class UserAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -245,12 +301,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: RequestBuilder */ - open class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { + open func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -259,11 +315,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -274,9 +333,11 @@ open class UserAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result in + open func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result in switch result { case let .success(response): observer.onNext(response.body) @@ -284,10 +345,13 @@ open class UserAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -300,9 +364,9 @@ open class UserAPI { - parameter password: (query) The password for login in clear text - returns: RequestBuilder */ - open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { + open func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { let localVariablePath = "/user/login" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -315,11 +379,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -328,9 +395,11 @@ open class UserAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = logoutUserWithRequestBuilder().execute(apiResponseQueue) { result in + open func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = logoutUserWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -338,10 +407,13 @@ open class UserAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -351,9 +423,9 @@ open class UserAPI { - GET /user/logout - returns: RequestBuilder */ - open class func logoutUserWithRequestBuilder() -> RequestBuilder { + open func logoutUserWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/user/logout" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -362,11 +434,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -377,9 +452,11 @@ open class UserAPI { - parameter apiResponseQueue: The queue on which api response is dispatched. - returns: Observable */ - open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { - return Observable.create { observer -> Disposable in - let requestTask = updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result in + open func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable { + return Observable.create { [weak self] observer -> Disposable in + let requestTask: RequestTask? + if let self { + requestTask = updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result in switch result { case .success: observer.onNext(()) @@ -387,10 +464,13 @@ open class UserAPI { observer.onError(error) } observer.onCompleted() + } + } else { + requestTask = nil } return Disposables.create { - requestTask.cancel() + requestTask?.cancel() } } } @@ -403,12 +483,12 @@ open class UserAPI { - parameter body: (body) Updated user object - returns: RequestBuilder */ - open class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { + open func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -417,10 +497,13 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 6fa4d0e20eb9..3f3e8894c3d6 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -71,8 +71,8 @@ open class URLSessionRequestBuilder: RequestBuilder { */ public var taskDidReceiveChallenge: PetstoreClientAPIChallengeHandler? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/rxswiftLibrary/docs/AnotherFakeAPI.md b/samples/client/petstore/swift5/rxswiftLibrary/docs/AnotherFakeAPI.md index f15b1445427d..47246fac7a3e 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/docs/AnotherFakeAPI.md +++ b/samples/client/petstore/swift5/rxswiftLibrary/docs/AnotherFakeAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **call123testSpecialTags** ```swift - open class func call123testSpecialTags(body: Client) -> Observable + open func call123testSpecialTags(body: Client) -> Observable ``` To test special tags diff --git a/samples/client/petstore/swift5/rxswiftLibrary/docs/FakeAPI.md b/samples/client/petstore/swift5/rxswiftLibrary/docs/FakeAPI.md index 350928e8e7f7..de1c69411439 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/docs/FakeAPI.md +++ b/samples/client/petstore/swift5/rxswiftLibrary/docs/FakeAPI.md @@ -20,7 +20,7 @@ Method | HTTP request | Description # **fakeOuterBooleanSerialize** ```swift - open class func fakeOuterBooleanSerialize(body: Bool? = nil) -> Observable + open func fakeOuterBooleanSerialize(body: Bool? = nil) -> Observable ``` @@ -60,7 +60,7 @@ No authorization required # **fakeOuterCompositeSerialize** ```swift - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil) -> Observable + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil) -> Observable ``` @@ -100,7 +100,7 @@ No authorization required # **fakeOuterNumberSerialize** ```swift - open class func fakeOuterNumberSerialize(body: Double? = nil) -> Observable + open func fakeOuterNumberSerialize(body: Double? = nil) -> Observable ``` @@ -140,7 +140,7 @@ No authorization required # **fakeOuterStringSerialize** ```swift - open class func fakeOuterStringSerialize(body: String? = nil) -> Observable + open func fakeOuterStringSerialize(body: String? = nil) -> Observable ``` @@ -180,7 +180,7 @@ No authorization required # **testBodyWithFileSchema** ```swift - open class func testBodyWithFileSchema(body: FileSchemaTestClass) -> Observable + open func testBodyWithFileSchema(body: FileSchemaTestClass) -> Observable ``` @@ -220,7 +220,7 @@ No authorization required # **testBodyWithQueryParams** ```swift - open class func testBodyWithQueryParams(query: String, body: User) -> Observable + open func testBodyWithQueryParams(query: String, body: User) -> Observable ``` @@ -260,7 +260,7 @@ No authorization required # **testClientModel** ```swift - open class func testClientModel(body: Client) -> Observable + open func testClientModel(body: Client) -> Observable ``` To test \"client\" model @@ -300,7 +300,7 @@ No authorization required # **testEndpointParameters** ```swift - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> Observable + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> Observable ``` Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -366,7 +366,7 @@ Void (empty response body) # **testEnumParameters** ```swift - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> Observable + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> Observable ``` To test enum parameters @@ -420,7 +420,7 @@ No authorization required # **testGroupParameters** ```swift - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> Observable + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> Observable ``` Fake endpoint to test group parameters (optional) @@ -470,7 +470,7 @@ No authorization required # **testInlineAdditionalProperties** ```swift - open class func testInlineAdditionalProperties(param: [String: String]) -> Observable + open func testInlineAdditionalProperties(param: [String: String]) -> Observable ``` test inline additionalProperties @@ -508,7 +508,7 @@ No authorization required # **testJsonFormData** ```swift - open class func testJsonFormData(param: String, param2: String) -> Observable + open func testJsonFormData(param: String, param2: String) -> Observable ``` test json serialization of form data diff --git a/samples/client/petstore/swift5/rxswiftLibrary/docs/FakeClassnameTags123API.md b/samples/client/petstore/swift5/rxswiftLibrary/docs/FakeClassnameTags123API.md index 2c9668be139a..b4d8b93d971d 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/docs/FakeClassnameTags123API.md +++ b/samples/client/petstore/swift5/rxswiftLibrary/docs/FakeClassnameTags123API.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **testClassname** ```swift - open class func testClassname(body: Client) -> Observable + open func testClassname(body: Client) -> Observable ``` To test class name in snake case diff --git a/samples/client/petstore/swift5/rxswiftLibrary/docs/PetAPI.md b/samples/client/petstore/swift5/rxswiftLibrary/docs/PetAPI.md index 6a03adef99da..ea10e2511bd5 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/docs/PetAPI.md +++ b/samples/client/petstore/swift5/rxswiftLibrary/docs/PetAPI.md @@ -17,7 +17,7 @@ Method | HTTP request | Description # **addPet** ```swift - open class func addPet(body: Pet) -> Observable + open func addPet(body: Pet) -> Observable ``` Add a new pet to the store @@ -55,7 +55,7 @@ Void (empty response body) # **deletePet** ```swift - open class func deletePet(petId: Int64, apiKey: String? = nil) -> Observable + open func deletePet(petId: Int64, apiKey: String? = nil) -> Observable ``` Deletes a pet @@ -95,7 +95,7 @@ Void (empty response body) # **findPetsByStatus** ```swift - open class func findPetsByStatus(status: [Status_findPetsByStatus]) -> Observable<[Pet]> + open func findPetsByStatus(status: [Status_findPetsByStatus]) -> Observable<[Pet]> ``` Finds Pets by status @@ -135,7 +135,7 @@ Name | Type | Description | Notes # **findPetsByTags** ```swift - open class func findPetsByTags(tags: [String]) -> Observable<[Pet]> + open func findPetsByTags(tags: [String]) -> Observable<[Pet]> ``` Finds Pets by tags @@ -175,7 +175,7 @@ Name | Type | Description | Notes # **getPetById** ```swift - open class func getPetById(petId: Int64) -> Observable + open func getPetById(petId: Int64) -> Observable ``` Find pet by ID @@ -215,7 +215,7 @@ Name | Type | Description | Notes # **updatePet** ```swift - open class func updatePet(body: Pet) -> Observable + open func updatePet(body: Pet) -> Observable ``` Update an existing pet @@ -253,7 +253,7 @@ Void (empty response body) # **updatePetWithForm** ```swift - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil) -> Observable + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil) -> Observable ``` Updates a pet in the store with form data @@ -295,7 +295,7 @@ Void (empty response body) # **uploadFile** ```swift - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> Observable + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> Observable ``` uploads an image @@ -337,7 +337,7 @@ Name | Type | Description | Notes # **uploadFileWithRequiredFile** ```swift - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> Observable + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> Observable ``` uploads an image (required) diff --git a/samples/client/petstore/swift5/rxswiftLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/rxswiftLibrary/docs/StoreAPI.md index ae87d585c5c4..b27acb4bda2f 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/docs/StoreAPI.md +++ b/samples/client/petstore/swift5/rxswiftLibrary/docs/StoreAPI.md @@ -12,7 +12,7 @@ Method | HTTP request | Description # **deleteOrder** ```swift - open class func deleteOrder(orderId: String) -> Observable + open func deleteOrder(orderId: String) -> Observable ``` Delete purchase order by ID @@ -52,7 +52,7 @@ No authorization required # **getInventory** ```swift - open class func getInventory() -> Observable<[String: Int]> + open func getInventory() -> Observable<[String: Int]> ``` Returns pet inventories by status @@ -88,7 +88,7 @@ This endpoint does not need any parameter. # **getOrderById** ```swift - open class func getOrderById(orderId: Int64) -> Observable + open func getOrderById(orderId: Int64) -> Observable ``` Find purchase order by ID @@ -128,7 +128,7 @@ No authorization required # **placeOrder** ```swift - open class func placeOrder(body: Order) -> Observable + open func placeOrder(body: Order) -> Observable ``` Place an order for a pet diff --git a/samples/client/petstore/swift5/rxswiftLibrary/docs/UserAPI.md b/samples/client/petstore/swift5/rxswiftLibrary/docs/UserAPI.md index 3abfe410f70a..12fcce55c1aa 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/docs/UserAPI.md +++ b/samples/client/petstore/swift5/rxswiftLibrary/docs/UserAPI.md @@ -16,7 +16,7 @@ Method | HTTP request | Description # **createUser** ```swift - open class func createUser(body: User) -> Observable + open func createUser(body: User) -> Observable ``` Create user @@ -56,7 +56,7 @@ No authorization required # **createUsersWithArrayInput** ```swift - open class func createUsersWithArrayInput(body: [User]) -> Observable + open func createUsersWithArrayInput(body: [User]) -> Observable ``` Creates list of users with given input array @@ -94,7 +94,7 @@ No authorization required # **createUsersWithListInput** ```swift - open class func createUsersWithListInput(body: [User]) -> Observable + open func createUsersWithListInput(body: [User]) -> Observable ``` Creates list of users with given input array @@ -132,7 +132,7 @@ No authorization required # **deleteUser** ```swift - open class func deleteUser(username: String) -> Observable + open func deleteUser(username: String) -> Observable ``` Delete user @@ -172,7 +172,7 @@ No authorization required # **getUserByName** ```swift - open class func getUserByName(username: String) -> Observable + open func getUserByName(username: String) -> Observable ``` Get user by user name @@ -210,7 +210,7 @@ No authorization required # **loginUser** ```swift - open class func loginUser(username: String, password: String) -> Observable + open func loginUser(username: String, password: String) -> Observable ``` Logs user into the system @@ -250,7 +250,7 @@ No authorization required # **logoutUser** ```swift - open class func logoutUser() -> Observable + open func logoutUser() -> Observable ``` Logs out current logged in user session @@ -284,7 +284,7 @@ No authorization required # **updateUser** ```swift - open class func updateUser(username: String, body: User) -> Observable + open func updateUser(username: String, body: User) -> Observable ``` Updated user diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs.swift index 3ad11a871d5a..49426a6f123a 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs.swift @@ -28,15 +28,13 @@ open class RequestBuilder { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders(PetstoreClientAPI.customHeaders) - addCredential() + self.credential = credential } open func addHeaders(_ aHeaders: [String: String]) { @@ -57,8 +55,8 @@ open class RequestBuilder { return self } - open func addCredential() { - credential = PetstoreClientAPI.credential + open func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift index a464702c03b8..8f46cea7f40e 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @@ -14,6 +17,22 @@ extension PetstoreClientAPI { open class AnotherFakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test special tags @@ -23,7 +42,7 @@ open class AnotherFakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -41,9 +60,9 @@ open class AnotherFakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { + open func call123testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/another-fake/dummy" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -52,11 +71,14 @@ open class AnotherFakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift index 6f88769930d8..921644a0be10 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @@ -14,6 +17,22 @@ extension PetstoreClientAPI { open class FakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** @@ -22,7 +41,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -39,9 +58,9 @@ open class FakeAPI { - parameter body: (body) Input boolean as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { + open func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/boolean" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -50,11 +69,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -64,7 +86,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -81,9 +103,9 @@ open class FakeAPI { - parameter body: (body) Input composite as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { + open func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/composite" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -92,11 +114,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -106,7 +131,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -123,9 +148,9 @@ open class FakeAPI { - parameter body: (body) Input number as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { + open func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/number" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -134,11 +159,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -148,7 +176,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { + open func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { return fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -165,9 +193,9 @@ open class FakeAPI { - parameter body: (body) Input string as post body (optional) - returns: RequestBuilder */ - open class func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { + open func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder { let localVariablePath = "/fake/outer/string" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -176,11 +204,14 @@ open class FakeAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -190,7 +221,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -207,9 +238,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { + open func testBodyWithFileSchemaWithRequestBuilder(body: FileSchemaTestClass) -> RequestBuilder { let localVariablePath = "/fake/body-with-file-schema" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -218,11 +249,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -233,7 +267,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -250,9 +284,9 @@ open class FakeAPI { - parameter body: (body) - returns: RequestBuilder */ - open class func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { + open func testBodyWithQueryParamsWithRequestBuilder(query: String, body: User) -> RequestBuilder { let localVariablePath = "/fake/body-with-query-params" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -264,11 +298,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -279,7 +316,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -297,9 +334,9 @@ open class FakeAPI { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -308,11 +345,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -336,7 +376,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result in switch result { case .success: @@ -370,9 +410,9 @@ open class FakeAPI { - parameter callback: (form) None (optional) - returns: RequestBuilder */ - open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { + open func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "integer": integer?.encodeToJSON(), "int32": int32?.encodeToJSON(), @@ -399,11 +439,14 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -488,7 +531,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result in switch result { case .success: @@ -513,9 +556,9 @@ open class FakeAPI { - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: RequestBuilder */ - open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { + open func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "enum_form_string_array": enumFormStringArray?.encodeToJSON(), "enum_form_string": enumFormString?.encodeToJSON(), @@ -538,11 +581,14 @@ open class FakeAPI { "enum_header_string": enumHeaderString?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -558,7 +604,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result in switch result { case .success: @@ -581,9 +627,9 @@ open class FakeAPI { - parameter int64Group: (query) Integer in group parameters (optional) - returns: RequestBuilder */ - open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { + open func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -599,11 +645,14 @@ open class FakeAPI { "boolean_group": booleanGroup?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -614,7 +663,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result in switch result { case .success: @@ -631,9 +680,9 @@ open class FakeAPI { - parameter param: (body) request body - returns: RequestBuilder */ - open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { + open func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder { let localVariablePath = "/fake/inline-additionalProperties" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -642,11 +691,14 @@ open class FakeAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -658,7 +710,7 @@ open class FakeAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result in switch result { case .success: @@ -676,9 +728,9 @@ open class FakeAPI { - parameter param2: (form) field2 - returns: RequestBuilder */ - open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { + open func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder { let localVariablePath = "/fake/jsonFormData" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "param": param.encodeToJSON(), "param2": param2.encodeToJSON(), @@ -693,11 +745,14 @@ open class FakeAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift index 28bd354a8ecd..d77d78402f53 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @@ -14,6 +17,22 @@ extension PetstoreClientAPI { open class FakeClassnameTags123API { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test class name in snake case @@ -23,7 +42,7 @@ open class FakeClassnameTags123API { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { + open func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) -> RequestTask { return testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -44,9 +63,9 @@ open class FakeClassnameTags123API { - parameter body: (body) client model - returns: RequestBuilder */ - open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { + open func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder { let localVariablePath = "/fake_classname_test" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -55,11 +74,14 @@ open class FakeClassnameTags123API { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PATCH", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift index 3741d7f42773..1e942e9168c4 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @@ -14,6 +17,22 @@ extension PetstoreClientAPI { open class PetAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Add a new pet to the store @@ -23,7 +42,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -46,9 +65,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func addPetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -57,11 +76,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -73,7 +95,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result in switch result { case .success: @@ -94,12 +116,12 @@ open class PetAPI { - parameter apiKey: (header) (optional) - returns: RequestBuilder */ - open class func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { + open func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -108,11 +130,14 @@ open class PetAPI { "api_key": apiKey?.encodeToJSON(), ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -132,7 +157,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { + open func findPetsByStatus(status: [Status_findPetsByStatus], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { return findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -153,9 +178,9 @@ open class PetAPI { - parameter status: (query) Status values that need to be considered for filter - returns: RequestBuilder<[Pet]> */ - open class func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { + open func findPetsByStatusWithRequestBuilder(status: [Status_findPetsByStatus]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByStatus" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -167,11 +192,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -183,7 +211,7 @@ open class PetAPI { */ @available(*, deprecated, message: "This operation is deprecated.") @discardableResult - open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { + open func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) -> RequestTask { return findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -205,9 +233,9 @@ open class PetAPI { - returns: RequestBuilder<[Pet]> */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { + open func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> { let localVariablePath = "/pet/findByTags" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -219,11 +247,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[Pet]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -234,7 +265,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) -> RequestTask { + open func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) -> RequestTask { return getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -255,12 +286,12 @@ open class PetAPI { - parameter petId: (path) ID of pet to return - returns: RequestBuilder */ - open class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { + open func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -269,11 +300,14 @@ open class PetAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -284,7 +318,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -304,9 +338,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: RequestBuilder */ - open class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { + open func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -315,11 +349,14 @@ open class PetAPI { "Content-Type": "application/json", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -332,7 +369,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result in switch result { case .success: @@ -354,12 +391,12 @@ open class PetAPI { - parameter status: (form) Updated status of the pet (optional) - returns: RequestBuilder */ - open class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { + open func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "name": name?.encodeToJSON(), "status": status?.encodeToJSON(), @@ -374,11 +411,14 @@ open class PetAPI { "Content-Type": "application/x-www-form-urlencoded", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -391,7 +431,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { return uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -413,12 +453,12 @@ open class PetAPI { - parameter file: (form) file to upload (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { + open func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder { var localVariablePath = "/pet/{petId}/uploadImage" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "file": file?.encodeToJSON(), @@ -433,11 +473,14 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -450,7 +493,7 @@ open class PetAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) -> RequestTask { return uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -472,12 +515,12 @@ open class PetAPI { - parameter additionalMetadata: (form) Additional data to pass to server (optional) - returns: RequestBuilder */ - open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { + open func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder { var localVariablePath = "/fake/{petId}/uploadImageWithRequiredFile" let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableFormParams: [String: Any?] = [ "additionalMetadata": additionalMetadata?.encodeToJSON(), "requiredFile": requiredFile.encodeToJSON(), @@ -492,11 +535,14 @@ open class PetAPI { "Content-Type": "multipart/form-data", ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift index 7eca4142f5fe..6a2792cd0ece 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @@ -14,6 +17,22 @@ extension PetstoreClientAPI { open class StoreAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Delete purchase order by ID @@ -23,7 +42,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case .success: @@ -41,12 +60,12 @@ open class StoreAPI { - parameter orderId: (path) ID of the order that needs to be deleted - returns: RequestBuilder */ - open class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { + open func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -55,11 +74,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -69,7 +91,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) -> RequestTask { + open func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) -> RequestTask { return getInventoryWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -89,9 +111,9 @@ open class StoreAPI { - name: api_key - returns: RequestBuilder<[String: Int]> */ - open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { + open func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> { let localVariablePath = "/store/inventory" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -100,11 +122,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder<[String: Int]>.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: true, credential: credential) } /** @@ -115,7 +140,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { + open func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { return getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -133,12 +158,12 @@ open class StoreAPI { - parameter orderId: (path) ID of pet that needs to be fetched - returns: RequestBuilder */ - open class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { + open func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = "\(APIHelper.mapValueToPathItem(orderId))" let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -147,11 +172,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -162,7 +190,7 @@ open class StoreAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { + open func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) -> RequestTask { return placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -179,9 +207,9 @@ open class StoreAPI { - parameter body: (body) order placed for purchasing the pet - returns: RequestBuilder */ - open class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { + open func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder { let localVariablePath = "/store/order" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -190,11 +218,14 @@ open class StoreAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/UserAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/UserAPI.swift index 77dc9bfdbd50..557dcb07f9d6 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/UserAPI.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/UserAPI.swift @@ -6,6 +6,9 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif @@ -14,6 +17,22 @@ extension PetstoreClientAPI { open class UserAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Create user @@ -23,7 +42,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -41,9 +60,9 @@ open class UserAPI { - parameter body: (body) Created user object - returns: RequestBuilder */ - open class func createUserWithRequestBuilder(body: User) -> RequestBuilder { + open func createUserWithRequestBuilder(body: User) -> RequestBuilder { let localVariablePath = "/user" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -52,11 +71,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -67,7 +89,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -84,9 +106,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithArray" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -95,11 +117,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -110,7 +135,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -127,9 +152,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: RequestBuilder */ - open class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { + open func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder { let localVariablePath = "/user/createWithList" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -138,11 +163,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -153,7 +181,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case .success: @@ -171,12 +199,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be deleted - returns: RequestBuilder */ - open class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { + open func deleteUserWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -185,11 +213,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "DELETE", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -200,7 +231,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) -> RequestTask { + open func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) -> RequestTask { return getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -217,12 +248,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: RequestBuilder */ - open class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { + open func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -231,11 +262,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -247,7 +281,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { + open func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) -> RequestTask { return loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -266,9 +300,9 @@ open class UserAPI { - parameter password: (query) The password for login in clear text - returns: RequestBuilder */ - open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { + open func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder { let localVariablePath = "/user/login" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil var localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -281,11 +315,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -295,7 +332,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return logoutUserWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case .success: @@ -311,9 +348,9 @@ open class UserAPI { - GET /user/logout - returns: RequestBuilder */ - open class func logoutUserWithRequestBuilder() -> RequestBuilder { + open func logoutUserWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/user/logout" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -322,11 +359,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } /** @@ -338,7 +378,7 @@ open class UserAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { + open func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask { return updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result in switch result { case .success: @@ -357,12 +397,12 @@ open class UserAPI { - parameter body: (body) Updated user object - returns: RequestBuilder */ - open class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { + open func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder { var localVariablePath = "/user/{username}" let usernamePreEscape = "\(APIHelper.mapValueToPathItem(username))" let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body) let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -371,11 +411,14 @@ open class UserAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getNonDecodableBuilder() - return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "PUT", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift index 6fa4d0e20eb9..3f3e8894c3d6 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift @@ -71,8 +71,8 @@ open class URLSessionRequestBuilder: RequestBuilder { */ public var taskDidReceiveChallenge: PetstoreClientAPIChallengeHandler? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/urlsessionLibrary/docs/AnotherFakeAPI.md b/samples/client/petstore/swift5/urlsessionLibrary/docs/AnotherFakeAPI.md index 26346e81a4cb..47c30277fb98 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/docs/AnotherFakeAPI.md +++ b/samples/client/petstore/swift5/urlsessionLibrary/docs/AnotherFakeAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **call123testSpecialTags** ```swift - open class func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func call123testSpecialTags(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test special tags @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test special tags -AnotherFakeAPI.call123testSpecialTags(body: body) { (response, error) in +AnotherFakeAPI().call123testSpecialTags(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/urlsessionLibrary/docs/FakeAPI.md b/samples/client/petstore/swift5/urlsessionLibrary/docs/FakeAPI.md index 69b1faa2b991..9df703b7b5d2 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/docs/FakeAPI.md +++ b/samples/client/petstore/swift5/urlsessionLibrary/docs/FakeAPI.md @@ -20,7 +20,7 @@ Method | HTTP request | Description # **fakeOuterBooleanSerialize** ```swift - open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) + open func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) ``` @@ -34,7 +34,7 @@ import PetstoreClient let body = true // Bool | Input boolean as post body (optional) -FakeAPI.fakeOuterBooleanSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterBooleanSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -69,7 +69,7 @@ No authorization required # **fakeOuterCompositeSerialize** ```swift - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping (_ data: OuterComposite?, _ error: Error?) -> Void) ``` @@ -83,7 +83,7 @@ import PetstoreClient let body = OuterComposite(myNumber: 123, myString: "myString_example", myBoolean: false) // OuterComposite | Input composite as post body (optional) -FakeAPI.fakeOuterCompositeSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterCompositeSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -118,7 +118,7 @@ No authorization required # **fakeOuterNumberSerialize** ```swift - open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) + open func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping (_ data: Double?, _ error: Error?) -> Void) ``` @@ -132,7 +132,7 @@ import PetstoreClient let body = 987 // Double | Input number as post body (optional) -FakeAPI.fakeOuterNumberSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterNumberSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -167,7 +167,7 @@ No authorization required # **fakeOuterStringSerialize** ```swift - open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func fakeOuterStringSerialize(body: String? = nil, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` @@ -181,7 +181,7 @@ import PetstoreClient let body = "body_example" // String | Input string as post body (optional) -FakeAPI.fakeOuterStringSerialize(body: body) { (response, error) in +FakeAPI().fakeOuterStringSerialize(body: body) { (response, error) in guard error == nil else { print(error) return @@ -216,7 +216,7 @@ No authorization required # **testBodyWithFileSchema** ```swift - open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -230,7 +230,7 @@ import PetstoreClient let body = FileSchemaTestClass(file: File(sourceURI: "sourceURI_example"), files: [nil]) // FileSchemaTestClass | -FakeAPI.testBodyWithFileSchema(body: body) { (response, error) in +FakeAPI().testBodyWithFileSchema(body: body) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ No authorization required # **testBodyWithQueryParams** ```swift - open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testBodyWithQueryParams(query: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` @@ -278,7 +278,7 @@ import PetstoreClient let query = "query_example" // String | let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | -FakeAPI.testBodyWithQueryParams(query: query, body: body) { (response, error) in +FakeAPI().testBodyWithQueryParams(query: query, body: body) { (response, error) in guard error == nil else { print(error) return @@ -314,7 +314,7 @@ No authorization required # **testClientModel** ```swift - open class func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClientModel(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test \"client\" model @@ -329,7 +329,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test \"client\" model -FakeAPI.testClientModel(body: body) { (response, error) in +FakeAPI().testClientModel(body: body) { (response, error) in guard error == nil else { print(error) return @@ -364,7 +364,7 @@ No authorization required # **testEndpointParameters** ```swift - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -392,7 +392,7 @@ let password = "password_example" // String | None (optional) let callback = "callback_example" // String | None (optional) // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 -FakeAPI.testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in +FakeAPI().testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { (response, error) in guard error == nil else { print(error) return @@ -440,7 +440,7 @@ Void (empty response body) # **testEnumParameters** ```swift - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` To test enum parameters @@ -462,7 +462,7 @@ let enumFormStringArray = ["inner_example"] // [String] | Form parameter enum te let enumFormString = "enumFormString_example" // String | Form parameter enum test (string) (optional) (default to .efg) // To test enum parameters -FakeAPI.testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in +FakeAPI().testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { (response, error) in guard error == nil else { print(error) return @@ -504,7 +504,7 @@ No authorization required # **testGroupParameters** ```swift - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Fake endpoint to test group parameters (optional) @@ -524,7 +524,7 @@ let booleanGroup = true // Bool | Boolean in group parameters (optional) let int64Group = 987 // Int64 | Integer in group parameters (optional) // Fake endpoint to test group parameters (optional) -FakeAPI.testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in +FakeAPI().testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group) { (response, error) in guard error == nil else { print(error) return @@ -564,7 +564,7 @@ No authorization required # **testInlineAdditionalProperties** ```swift - open class func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testInlineAdditionalProperties(param: [String: String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test inline additionalProperties @@ -577,7 +577,7 @@ import PetstoreClient let param = "TODO" // [String: String] | request body // test inline additionalProperties -FakeAPI.testInlineAdditionalProperties(param: param) { (response, error) in +FakeAPI().testInlineAdditionalProperties(param: param) { (response, error) in guard error == nil else { print(error) return @@ -612,7 +612,7 @@ No authorization required # **testJsonFormData** ```swift - open class func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func testJsonFormData(param: String, param2: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` test json serialization of form data @@ -626,7 +626,7 @@ let param = "param_example" // String | field1 let param2 = "param2_example" // String | field2 // test json serialization of form data -FakeAPI.testJsonFormData(param: param, param2: param2) { (response, error) in +FakeAPI().testJsonFormData(param: param, param2: param2) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/urlsessionLibrary/docs/FakeClassnameTags123API.md b/samples/client/petstore/swift5/urlsessionLibrary/docs/FakeClassnameTags123API.md index 5b9b66073fe0..7ef18c9cc1d5 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/docs/FakeClassnameTags123API.md +++ b/samples/client/petstore/swift5/urlsessionLibrary/docs/FakeClassnameTags123API.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **testClassname** ```swift - open class func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) + open func testClassname(body: Client, completion: @escaping (_ data: Client?, _ error: Error?) -> Void) ``` To test class name in snake case @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test class name in snake case -FakeClassnameTags123API.testClassname(body: body) { (response, error) in +FakeClassnameTags123API().testClassname(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/urlsessionLibrary/docs/PetAPI.md b/samples/client/petstore/swift5/urlsessionLibrary/docs/PetAPI.md index e6219c37c4ec..12cd425b07b8 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/docs/PetAPI.md +++ b/samples/client/petstore/swift5/urlsessionLibrary/docs/PetAPI.md @@ -17,7 +17,7 @@ Method | HTTP request | Description # **addPet** ```swift - open class func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func addPet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Add a new pet to the store @@ -30,7 +30,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Add a new pet to the store -PetAPI.addPet(body: body) { (response, error) in +PetAPI().addPet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -65,7 +65,7 @@ Void (empty response body) # **deletePet** ```swift - open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Deletes a pet @@ -79,7 +79,7 @@ let petId = 987 // Int64 | Pet id to delete let apiKey = "apiKey_example" // String | (optional) // Deletes a pet -PetAPI.deletePet(petId: petId, apiKey: apiKey) { (response, error) in +PetAPI().deletePet(petId: petId, apiKey: apiKey) { (response, error) in guard error == nil else { print(error) return @@ -115,7 +115,7 @@ Void (empty response body) # **findPetsByStatus** ```swift - open class func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + open func findPetsByStatus(status: [Status_findPetsByStatus], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by status @@ -130,7 +130,7 @@ import PetstoreClient let status = ["status_example"] // [String] | Status values that need to be considered for filter // Finds Pets by status -PetAPI.findPetsByStatus(status: status) { (response, error) in +PetAPI().findPetsByStatus(status: status) { (response, error) in guard error == nil else { print(error) return @@ -165,7 +165,7 @@ Name | Type | Description | Notes # **findPetsByTags** ```swift - open class func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) + open func findPetsByTags(tags: [String], completion: @escaping (_ data: [Pet]?, _ error: Error?) -> Void) ``` Finds Pets by tags @@ -180,7 +180,7 @@ import PetstoreClient let tags = ["inner_example"] // [String] | Tags to filter by // Finds Pets by tags -PetAPI.findPetsByTags(tags: tags) { (response, error) in +PetAPI().findPetsByTags(tags: tags) { (response, error) in guard error == nil else { print(error) return @@ -215,7 +215,7 @@ Name | Type | Description | Notes # **getPetById** ```swift - open class func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) + open func getPetById(petId: Int64, completion: @escaping (_ data: Pet?, _ error: Error?) -> Void) ``` Find pet by ID @@ -230,7 +230,7 @@ import PetstoreClient let petId = 987 // Int64 | ID of pet to return // Find pet by ID -PetAPI.getPetById(petId: petId) { (response, error) in +PetAPI().getPetById(petId: petId) { (response, error) in guard error == nil else { print(error) return @@ -265,7 +265,7 @@ Name | Type | Description | Notes # **updatePet** ```swift - open class func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePet(body: Pet, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Update an existing pet @@ -278,7 +278,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Update an existing pet -PetAPI.updatePet(body: body) { (response, error) in +PetAPI().updatePet(body: body) { (response, error) in guard error == nil else { print(error) return @@ -313,7 +313,7 @@ Void (empty response body) # **updatePetWithForm** ```swift - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updates a pet in the store with form data @@ -328,7 +328,7 @@ let name = "name_example" // String | Updated name of the pet (optional) let status = "status_example" // String | Updated status of the pet (optional) // Updates a pet in the store with form data -PetAPI.updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in +PetAPI().updatePetWithForm(petId: petId, name: name, status: status) { (response, error) in guard error == nil else { print(error) return @@ -365,7 +365,7 @@ Void (empty response body) # **uploadFile** ```swift - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image @@ -380,7 +380,7 @@ let additionalMetadata = "additionalMetadata_example" // String | Additional dat let file = URL(string: "https://example.com")! // URL | file to upload (optional) // uploads an image -PetAPI.uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in +PetAPI().uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { (response, error) in guard error == nil else { print(error) return @@ -417,7 +417,7 @@ Name | Type | Description | Notes # **uploadFileWithRequiredFile** ```swift - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping (_ data: ApiResponse?, _ error: Error?) -> Void) ``` uploads an image (required) @@ -432,7 +432,7 @@ let requiredFile = URL(string: "https://example.com")! // URL | file to upload let additionalMetadata = "additionalMetadata_example" // String | Additional data to pass to server (optional) // uploads an image (required) -PetAPI.uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in +PetAPI().uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/urlsessionLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/urlsessionLibrary/docs/StoreAPI.md index edb75e33b70b..3375f6ac5c73 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/docs/StoreAPI.md +++ b/samples/client/petstore/swift5/urlsessionLibrary/docs/StoreAPI.md @@ -12,7 +12,7 @@ Method | HTTP request | Description # **deleteOrder** ```swift - open class func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteOrder(orderId: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete purchase order by ID @@ -27,7 +27,7 @@ import PetstoreClient let orderId = "orderId_example" // String | ID of the order that needs to be deleted // Delete purchase order by ID -StoreAPI.deleteOrder(orderId: orderId) { (response, error) in +StoreAPI().deleteOrder(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -62,7 +62,7 @@ No authorization required # **getInventory** ```swift - open class func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) + open func getInventory(completion: @escaping (_ data: [String: Int]?, _ error: Error?) -> Void) ``` Returns pet inventories by status @@ -76,7 +76,7 @@ import PetstoreClient // Returns pet inventories by status -StoreAPI.getInventory() { (response, error) in +StoreAPI().getInventory() { (response, error) in guard error == nil else { print(error) return @@ -108,7 +108,7 @@ This endpoint does not need any parameter. # **getOrderById** ```swift - open class func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func getOrderById(orderId: Int64, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Find purchase order by ID @@ -123,7 +123,7 @@ import PetstoreClient let orderId = 987 // Int64 | ID of pet that needs to be fetched // Find purchase order by ID -StoreAPI.getOrderById(orderId: orderId) { (response, error) in +StoreAPI().getOrderById(orderId: orderId) { (response, error) in guard error == nil else { print(error) return @@ -158,7 +158,7 @@ No authorization required # **placeOrder** ```swift - open class func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) + open func placeOrder(body: Order, completion: @escaping (_ data: Order?, _ error: Error?) -> Void) ``` Place an order for a pet @@ -171,7 +171,7 @@ import PetstoreClient let body = Order(id: 123, petId: 123, quantity: 123, shipDate: Date(), status: "status_example", complete: false) // Order | order placed for purchasing the pet // Place an order for a pet -StoreAPI.placeOrder(body: body) { (response, error) in +StoreAPI().placeOrder(body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/urlsessionLibrary/docs/UserAPI.md b/samples/client/petstore/swift5/urlsessionLibrary/docs/UserAPI.md index 5fc9160daf47..54ad86b31144 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/docs/UserAPI.md +++ b/samples/client/petstore/swift5/urlsessionLibrary/docs/UserAPI.md @@ -16,7 +16,7 @@ Method | HTTP request | Description # **createUser** ```swift - open class func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUser(body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Create user @@ -31,7 +31,7 @@ import PetstoreClient let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Created user object // Create user -UserAPI.createUser(body: body) { (response, error) in +UserAPI().createUser(body: body) { (response, error) in guard error == nil else { print(error) return @@ -66,7 +66,7 @@ No authorization required # **createUsersWithArrayInput** ```swift - open class func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithArrayInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -79,7 +79,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithArrayInput(body: body) { (response, error) in +UserAPI().createUsersWithArrayInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -114,7 +114,7 @@ No authorization required # **createUsersWithListInput** ```swift - open class func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func createUsersWithListInput(body: [User], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Creates list of users with given input array @@ -127,7 +127,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithListInput(body: body) { (response, error) in +UserAPI().createUsersWithListInput(body: body) { (response, error) in guard error == nil else { print(error) return @@ -162,7 +162,7 @@ No authorization required # **deleteUser** ```swift - open class func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func deleteUser(username: String, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Delete user @@ -177,7 +177,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be deleted // Delete user -UserAPI.deleteUser(username: username) { (response, error) in +UserAPI().deleteUser(username: username) { (response, error) in guard error == nil else { print(error) return @@ -212,7 +212,7 @@ No authorization required # **getUserByName** ```swift - open class func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) + open func getUserByName(username: String, completion: @escaping (_ data: User?, _ error: Error?) -> Void) ``` Get user by user name @@ -225,7 +225,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be fetched. Use user1 for testing. // Get user by user name -UserAPI.getUserByName(username: username) { (response, error) in +UserAPI().getUserByName(username: username) { (response, error) in guard error == nil else { print(error) return @@ -260,7 +260,7 @@ No authorization required # **loginUser** ```swift - open class func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) + open func loginUser(username: String, password: String, completion: @escaping (_ data: String?, _ error: Error?) -> Void) ``` Logs user into the system @@ -274,7 +274,7 @@ let username = "username_example" // String | The user name for login let password = "password_example" // String | The password for login in clear text // Logs user into the system -UserAPI.loginUser(username: username, password: password) { (response, error) in +UserAPI().loginUser(username: username, password: password) { (response, error) in guard error == nil else { print(error) return @@ -310,7 +310,7 @@ No authorization required # **logoutUser** ```swift - open class func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func logoutUser(completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Logs out current logged in user session @@ -322,7 +322,7 @@ import PetstoreClient // Logs out current logged in user session -UserAPI.logoutUser() { (response, error) in +UserAPI().logoutUser() { (response, error) in guard error == nil else { print(error) return @@ -354,7 +354,7 @@ No authorization required # **updateUser** ```swift - open class func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) + open func updateUser(username: String, body: User, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) ``` Updated user @@ -370,7 +370,7 @@ let username = "username_example" // String | name that need to be deleted let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Updated user object // Updated user -UserAPI.updateUser(username: username, body: body) { (response, error) in +UserAPI().updateUser(username: username, body: body) { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/APIs.swift index ac0a6317e6ef..cfc89b47da3a 100644 --- a/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -28,15 +28,13 @@ open class RequestBuilder { /// Optional block to obtain a reference to the request's progress instance when available. public var onProgressReady: ((Progress) -> Void)? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { self.method = method self.URLString = URLString self.parameters = parameters self.headers = headers self.requiresAuthentication = requiresAuthentication - - addHeaders(PetstoreClientAPI.customHeaders) - addCredential() + self.credential = credential } open func addHeaders(_ aHeaders: [String: String]) { @@ -57,8 +55,8 @@ open class RequestBuilder { return self } - open func addCredential() { - credential = PetstoreClientAPI.credential + open func addCredential(credential: URLCredential) { + self.credential = credential } } diff --git a/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift b/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift index a770929262ab..7b444f250015 100644 --- a/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift +++ b/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift @@ -6,11 +6,30 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif #if canImport(AnyCodable) import AnyCodable #endif open class DefaultAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** @@ -18,7 +37,7 @@ open class DefaultAPI { - parameter completion: completion handler to receive the data and the error objects */ @discardableResult - open class func rootGet(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Banana?, _ error: Error?) -> Void)) -> RequestTask { + open func rootGet(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Banana?, _ error: Error?) -> Void)) -> RequestTask { return rootGetWithRequestBuilder().execute(apiResponseQueue) { result in switch result { case let .success(response): @@ -33,9 +52,9 @@ open class DefaultAPI { - GET / - returns: RequestBuilder */ - open class func rootGetWithRequestBuilder() -> RequestBuilder { + open func rootGetWithRequestBuilder() -> RequestBuilder { let localVariablePath = "/" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath let localVariableParameters: [String: Any]? = nil let localVariableUrlComponents = URLComponents(string: localVariableURLString) @@ -44,10 +63,13 @@ open class DefaultAPI { : ] - let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + var localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + for (header, value) in customHeaders { + localVariableHeaderParameters[header] = value + } - let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + let localVariableRequestBuilder: RequestBuilder.Type = requestBuilderFactory.getBuilder() - return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false, credential: credential) } } diff --git a/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 6fa4d0e20eb9..3f3e8894c3d6 100644 --- a/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -71,8 +71,8 @@ open class URLSessionRequestBuilder: RequestBuilder { */ public var taskDidReceiveChallenge: PetstoreClientAPIChallengeHandler? - required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { - super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool, credential: URLCredential?) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication, credential: credential) } /** diff --git a/samples/client/petstore/swift5/validation/docs/DefaultAPI.md b/samples/client/petstore/swift5/validation/docs/DefaultAPI.md index 897b27e353c4..28a993c402db 100644 --- a/samples/client/petstore/swift5/validation/docs/DefaultAPI.md +++ b/samples/client/petstore/swift5/validation/docs/DefaultAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **rootGet** ```swift - open class func rootGet(completion: @escaping (_ data: Banana?, _ error: Error?) -> Void) + open func rootGet(completion: @escaping (_ data: Banana?, _ error: Error?) -> Void) ``` @@ -20,7 +20,7 @@ Method | HTTP request | Description import PetstoreClient -DefaultAPI.rootGet() { (response, error) in +DefaultAPI().rootGet() { (response, error) in guard error == nil else { print(error) return diff --git a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift index 7952dc85a9d1..65848687e5a8 100644 --- a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +++ b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import Vapor #if canImport(AnyCodable) import AnyCodable #endif open class AnotherFakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test special tags @@ -21,9 +40,9 @@ open class AnotherFakeAPI { - parameter body: (body) client model - returns: `EventLoopFuture` of `ClientResponse` */ - open class func call123testSpecialTagsRaw(uuidTest: UUID, body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func call123testSpecialTagsRaw(uuidTest: UUID, body: Client, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/another-fake/dummy" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -54,7 +73,7 @@ open class AnotherFakeAPI { - parameter body: (body) client model - returns: `EventLoopFuture` of `Call123testSpecialTags` */ - open class func call123testSpecialTags(uuidTest: UUID, body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func call123testSpecialTags(uuidTest: UUID, body: Client, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return call123testSpecialTagsRaw(uuidTest: uuidTest, body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> Call123testSpecialTags in switch response.status.code { case 200: diff --git a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift index 014da8378336..7ffb5fc989c7 100644 --- a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import Vapor #if canImport(AnyCodable) import AnyCodable #endif open class FakeAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** creates an XmlItem @@ -20,9 +39,9 @@ open class FakeAPI { - parameter xmlItem: (body) XmlItem Body - returns: `EventLoopFuture` of `ClientResponse` */ - open class func createXmlItemRaw(xmlItem: XmlItem, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func createXmlItemRaw(xmlItem: XmlItem, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake/create_xml_item" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -50,7 +69,7 @@ open class FakeAPI { - parameter xmlItem: (body) XmlItem Body - returns: `EventLoopFuture` of `CreateXmlItem` */ - open class func createXmlItem(xmlItem: XmlItem, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func createXmlItem(xmlItem: XmlItem, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return createXmlItemRaw(xmlItem: xmlItem, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> CreateXmlItem in switch response.status.code { case 200: @@ -67,9 +86,9 @@ open class FakeAPI { - parameter body: (body) Input boolean as post body (optional) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func fakeOuterBooleanSerializeRaw(body: Bool? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func fakeOuterBooleanSerializeRaw(body: Bool? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake/outer/boolean" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -98,7 +117,7 @@ open class FakeAPI { - parameter body: (body) Input boolean as post body (optional) - returns: `EventLoopFuture` of `FakeOuterBooleanSerialize` */ - open class func fakeOuterBooleanSerialize(body: Bool? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func fakeOuterBooleanSerialize(body: Bool? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return fakeOuterBooleanSerializeRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> FakeOuterBooleanSerialize in switch response.status.code { case 200: @@ -115,9 +134,9 @@ open class FakeAPI { - parameter body: (body) Input composite as post body (optional) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func fakeOuterCompositeSerializeRaw(body: OuterComposite? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func fakeOuterCompositeSerializeRaw(body: OuterComposite? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake/outer/composite" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -146,7 +165,7 @@ open class FakeAPI { - parameter body: (body) Input composite as post body (optional) - returns: `EventLoopFuture` of `FakeOuterCompositeSerialize` */ - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return fakeOuterCompositeSerializeRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> FakeOuterCompositeSerialize in switch response.status.code { case 200: @@ -163,9 +182,9 @@ open class FakeAPI { - parameter body: (body) Input number as post body (optional) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func fakeOuterNumberSerializeRaw(body: Double? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func fakeOuterNumberSerializeRaw(body: Double? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake/outer/number" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -194,7 +213,7 @@ open class FakeAPI { - parameter body: (body) Input number as post body (optional) - returns: `EventLoopFuture` of `FakeOuterNumberSerialize` */ - open class func fakeOuterNumberSerialize(body: Double? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func fakeOuterNumberSerialize(body: Double? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return fakeOuterNumberSerializeRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> FakeOuterNumberSerialize in switch response.status.code { case 200: @@ -211,9 +230,9 @@ open class FakeAPI { - parameter body: (body) Input string as post body (optional) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func fakeOuterStringSerializeRaw(body: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func fakeOuterStringSerializeRaw(body: String? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake/outer/string" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -242,7 +261,7 @@ open class FakeAPI { - parameter body: (body) Input string as post body (optional) - returns: `EventLoopFuture` of `FakeOuterStringSerialize` */ - open class func fakeOuterStringSerialize(body: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func fakeOuterStringSerialize(body: String? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return fakeOuterStringSerializeRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> FakeOuterStringSerialize in switch response.status.code { case 200: @@ -259,9 +278,9 @@ open class FakeAPI { - parameter body: (body) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func testBodyWithFileSchemaRaw(body: FileSchemaTestClass, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testBodyWithFileSchemaRaw(body: FileSchemaTestClass, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake/body-with-file-schema" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -288,7 +307,7 @@ open class FakeAPI { - parameter body: (body) - returns: `EventLoopFuture` of `TestBodyWithFileSchema` */ - open class func testBodyWithFileSchema(body: FileSchemaTestClass, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testBodyWithFileSchema(body: FileSchemaTestClass, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return testBodyWithFileSchemaRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> TestBodyWithFileSchema in switch response.status.code { case 200: @@ -305,9 +324,9 @@ open class FakeAPI { - parameter body: (body) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func testBodyWithQueryParamsRaw(query: String, body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testBodyWithQueryParamsRaw(query: String, body: User, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake/body-with-query-params" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -341,7 +360,7 @@ open class FakeAPI { - parameter body: (body) - returns: `EventLoopFuture` of `TestBodyWithQueryParams` */ - open class func testBodyWithQueryParams(query: String, body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testBodyWithQueryParams(query: String, body: User, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return testBodyWithQueryParamsRaw(query: query, body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> TestBodyWithQueryParams in switch response.status.code { case 200: @@ -359,9 +378,9 @@ open class FakeAPI { - parameter body: (body) client model - returns: `EventLoopFuture` of `ClientResponse` */ - open class func testClientModelRaw(body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testClientModelRaw(body: Client, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -389,7 +408,7 @@ open class FakeAPI { - parameter body: (body) client model - returns: `EventLoopFuture` of `TestClientModel` */ - open class func testClientModel(body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testClientModel(body: Client, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return testClientModelRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> TestClientModel in switch response.status.code { case 200: @@ -423,9 +442,9 @@ open class FakeAPI { - parameter callback: (form) None (optional) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func testEndpointParametersRaw(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testEndpointParametersRaw(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -486,7 +505,7 @@ open class FakeAPI { - parameter callback: (form) None (optional) - returns: `EventLoopFuture` of `TestEndpointParameters` */ - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return testEndpointParametersRaw(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> TestEndpointParameters in switch response.status.code { case 400: @@ -580,9 +599,9 @@ open class FakeAPI { - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func testEnumParametersRaw(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testEnumParametersRaw(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -639,7 +658,7 @@ open class FakeAPI { - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .efg) - returns: `EventLoopFuture` of `TestEnumParameters` */ - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return testEnumParametersRaw(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> TestEnumParameters in switch response.status.code { case 400: @@ -664,9 +683,9 @@ open class FakeAPI { - parameter int64Group: (query) Integer in group parameters (optional) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func testGroupParametersRaw(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testGroupParametersRaw(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -715,7 +734,7 @@ open class FakeAPI { - parameter int64Group: (query) Integer in group parameters (optional) - returns: `EventLoopFuture` of `TestGroupParameters` */ - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return testGroupParametersRaw(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> TestGroupParameters in switch response.status.code { case 400: @@ -732,9 +751,9 @@ open class FakeAPI { - parameter param: (body) request body - returns: `EventLoopFuture` of `ClientResponse` */ - open class func testInlineAdditionalPropertiesRaw(param: [String: String], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testInlineAdditionalPropertiesRaw(param: [String: String], headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake/inline-additionalProperties" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -761,7 +780,7 @@ open class FakeAPI { - parameter param: (body) request body - returns: `EventLoopFuture` of `TestInlineAdditionalProperties` */ - open class func testInlineAdditionalProperties(param: [String: String], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testInlineAdditionalProperties(param: [String: String], headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return testInlineAdditionalPropertiesRaw(param: param, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> TestInlineAdditionalProperties in switch response.status.code { case 200: @@ -779,9 +798,9 @@ open class FakeAPI { - parameter param2: (form) field2 - returns: `EventLoopFuture` of `ClientResponse` */ - open class func testJsonFormDataRaw(param: String, param2: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testJsonFormDataRaw(param: String, param2: String, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake/jsonFormData" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -813,7 +832,7 @@ open class FakeAPI { - parameter param2: (form) field2 - returns: `EventLoopFuture` of `TestJsonFormData` */ - open class func testJsonFormData(param: String, param2: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testJsonFormData(param: String, param2: String, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return testJsonFormDataRaw(param: param, param2: param2, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> TestJsonFormData in switch response.status.code { case 200: @@ -834,9 +853,9 @@ open class FakeAPI { - parameter context: (query) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func testQueryParameterCollectionFormatRaw(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testQueryParameterCollectionFormatRaw(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake/test-query-parameters" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -881,7 +900,7 @@ open class FakeAPI { - parameter context: (query) - returns: `EventLoopFuture` of `TestQueryParameterCollectionFormat` */ - open class func testQueryParameterCollectionFormat(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testQueryParameterCollectionFormat(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return testQueryParameterCollectionFormatRaw(pipe: pipe, ioutil: ioutil, http: http, url: url, context: context, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> TestQueryParameterCollectionFormat in switch response.status.code { case 200: diff --git a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift index e8ad26cffed6..5ab12f8c1859 100644 --- a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +++ b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import Vapor #if canImport(AnyCodable) import AnyCodable #endif open class FakeClassnameTags123API { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** To test class name in snake case @@ -23,9 +42,9 @@ open class FakeClassnameTags123API { - parameter body: (body) client model - returns: `EventLoopFuture` of `ClientResponse` */ - open class func testClassnameRaw(body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testClassnameRaw(body: Client, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/fake_classname_test" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -56,7 +75,7 @@ open class FakeClassnameTags123API { - parameter body: (body) client model - returns: `EventLoopFuture` of `TestClassname` */ - open class func testClassname(body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func testClassname(body: Client, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return testClassnameRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> TestClassname in switch response.status.code { case 200: diff --git a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/PetAPI.swift b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/PetAPI.swift index 78177ef4dd36..dea82585c873 100644 --- a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/PetAPI.swift +++ b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/PetAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import Vapor #if canImport(AnyCodable) import AnyCodable #endif open class PetAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Add a new pet to the store @@ -22,9 +41,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: `EventLoopFuture` of `ClientResponse` */ - open class func addPetRaw(body: Pet, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func addPetRaw(body: Pet, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -55,7 +74,7 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: `EventLoopFuture` of `AddPet` */ - open class func addPet(body: Pet, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func addPet(body: Pet, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return addPetRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> AddPet in switch response.status.code { case 200: @@ -78,12 +97,12 @@ open class PetAPI { - parameter apiKey: (header) (optional) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func deletePetRaw(petId: Int64, apiKey: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func deletePetRaw(petId: Int64, apiKey: String? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { var localVariablePath = "/pet/{petId}" let petIdPreEscape = String(describing: petId) let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -116,7 +135,7 @@ open class PetAPI { - parameter apiKey: (header) (optional) - returns: `EventLoopFuture` of `DeletePet` */ - open class func deletePet(petId: Int64, apiKey: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func deletePet(petId: Int64, apiKey: String? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return deletePetRaw(petId: petId, apiKey: apiKey, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> DeletePet in switch response.status.code { case 200: @@ -148,9 +167,9 @@ open class PetAPI { - parameter status: (query) Status values that need to be considered for filter - returns: `EventLoopFuture` of `ClientResponse` */ - open class func findPetsByStatusRaw(status: [Status_findPetsByStatus], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func findPetsByStatusRaw(status: [Status_findPetsByStatus], headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/pet/findByStatus" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -188,7 +207,7 @@ open class PetAPI { - parameter status: (query) Status values that need to be considered for filter - returns: `EventLoopFuture` of `FindPetsByStatus` */ - open class func findPetsByStatus(status: [Status_findPetsByStatus], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func findPetsByStatus(status: [Status_findPetsByStatus], headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return findPetsByStatusRaw(status: status, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> FindPetsByStatus in switch response.status.code { case 200: @@ -212,9 +231,9 @@ open class PetAPI { - returns: `EventLoopFuture` of `ClientResponse` */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTagsRaw(tags: Set, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func findPetsByTagsRaw(tags: Set, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/pet/findByTags" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -253,7 +272,7 @@ open class PetAPI { - returns: `EventLoopFuture` of `FindPetsByTags` */ @available(*, deprecated, message: "This operation is deprecated.") - open class func findPetsByTags(tags: Set, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func findPetsByTags(tags: Set, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return findPetsByTagsRaw(tags: tags, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> FindPetsByTags in switch response.status.code { case 200: @@ -276,12 +295,12 @@ open class PetAPI { - parameter petId: (path) ID of pet to return - returns: `EventLoopFuture` of `ClientResponse` */ - open class func getPetByIdRaw(petId: Int64, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func getPetByIdRaw(petId: Int64, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { var localVariablePath = "/pet/{petId}" let petIdPreEscape = String(describing: petId) let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -313,7 +332,7 @@ open class PetAPI { - parameter petId: (path) ID of pet to return - returns: `EventLoopFuture` of `GetPetById` */ - open class func getPetById(petId: Int64, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func getPetById(petId: Int64, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return getPetByIdRaw(petId: petId, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> GetPetById in switch response.status.code { case 200: @@ -337,9 +356,9 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: `EventLoopFuture` of `ClientResponse` */ - open class func updatePetRaw(body: Pet, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func updatePetRaw(body: Pet, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/pet" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -372,7 +391,7 @@ open class PetAPI { - parameter body: (body) Pet object that needs to be added to the store - returns: `EventLoopFuture` of `UpdatePet` */ - open class func updatePet(body: Pet, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func updatePet(body: Pet, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return updatePetRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> UpdatePet in switch response.status.code { case 200: @@ -400,12 +419,12 @@ open class PetAPI { - parameter status: (form) Updated status of the pet (optional) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func updatePetWithFormRaw(petId: Int64, name: String? = nil, status: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func updatePetWithFormRaw(petId: Int64, name: String? = nil, status: String? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { var localVariablePath = "/pet/{petId}" let petIdPreEscape = String(describing: petId) let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -441,7 +460,7 @@ open class PetAPI { - parameter status: (form) Updated status of the pet (optional) - returns: `EventLoopFuture` of `UpdatePetWithForm` */ - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return updatePetWithFormRaw(petId: petId, name: name, status: status, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> UpdatePetWithForm in switch response.status.code { case 405: @@ -463,12 +482,12 @@ open class PetAPI { - parameter file: (form) file to upload (optional) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func uploadFileRaw(petId: Int64, additionalMetadata: String? = nil, file: Data? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func uploadFileRaw(petId: Int64, additionalMetadata: String? = nil, file: Data? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { var localVariablePath = "/pet/{petId}/uploadImage" let petIdPreEscape = String(describing: petId) let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -504,7 +523,7 @@ open class PetAPI { - parameter file: (form) file to upload (optional) - returns: `EventLoopFuture` of `UploadFile` */ - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: Data? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: Data? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return uploadFileRaw(petId: petId, additionalMetadata: additionalMetadata, file: file, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> UploadFile in switch response.status.code { case 200: @@ -526,12 +545,12 @@ open class PetAPI { - parameter additionalMetadata: (form) Additional data to pass to server (optional) - returns: `EventLoopFuture` of `ClientResponse` */ - open class func uploadFileWithRequiredFileRaw(petId: Int64, requiredFile: Data, additionalMetadata: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func uploadFileWithRequiredFileRaw(petId: Int64, requiredFile: Data, additionalMetadata: String? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { var localVariablePath = "/fake/{petId}/uploadImageWithRequiredFile" let petIdPreEscape = String(describing: petId) let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -567,7 +586,7 @@ open class PetAPI { - parameter additionalMetadata: (form) Additional data to pass to server (optional) - returns: `EventLoopFuture` of `UploadFileWithRequiredFile` */ - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: Data, additionalMetadata: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: Data, additionalMetadata: String? = nil, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return uploadFileWithRequiredFileRaw(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> UploadFileWithRequiredFile in switch response.status.code { case 200: diff --git a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift index a71ba07e86f1..afd0a8ec31a4 100644 --- a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import Vapor #if canImport(AnyCodable) import AnyCodable #endif open class StoreAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Delete purchase order by ID @@ -20,12 +39,12 @@ open class StoreAPI { - parameter orderId: (path) ID of the order that needs to be deleted - returns: `EventLoopFuture` of `ClientResponse` */ - open class func deleteOrderRaw(orderId: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func deleteOrderRaw(orderId: String, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = String(describing: orderId) let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -53,7 +72,7 @@ open class StoreAPI { - parameter orderId: (path) ID of the order that needs to be deleted - returns: `EventLoopFuture` of `DeleteOrder` */ - open class func deleteOrder(orderId: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func deleteOrder(orderId: String, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return deleteOrderRaw(orderId: orderId, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> DeleteOrder in switch response.status.code { case 400: @@ -75,9 +94,9 @@ open class StoreAPI { - name: api_key - returns: `EventLoopFuture` of `ClientResponse` */ - open class func getInventoryRaw(headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func getInventoryRaw(headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/store/inventory" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -106,7 +125,7 @@ open class StoreAPI { - name: api_key - returns: `EventLoopFuture` of `GetInventory` */ - open class func getInventory(headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func getInventory(headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return getInventoryRaw(headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> GetInventory in switch response.status.code { case 200: @@ -124,12 +143,12 @@ open class StoreAPI { - parameter orderId: (path) ID of pet that needs to be fetched - returns: `EventLoopFuture` of `ClientResponse` */ - open class func getOrderByIdRaw(orderId: Int64, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func getOrderByIdRaw(orderId: Int64, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { var localVariablePath = "/store/order/{order_id}" let orderIdPreEscape = String(describing: orderId) let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -158,7 +177,7 @@ open class StoreAPI { - parameter orderId: (path) ID of pet that needs to be fetched - returns: `EventLoopFuture` of `GetOrderById` */ - open class func getOrderById(orderId: Int64, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func getOrderById(orderId: Int64, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return getOrderByIdRaw(orderId: orderId, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> GetOrderById in switch response.status.code { case 200: @@ -179,9 +198,9 @@ open class StoreAPI { - parameter body: (body) order placed for purchasing the pet - returns: `EventLoopFuture` of `ClientResponse` */ - open class func placeOrderRaw(body: Order, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func placeOrderRaw(body: Order, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/store/order" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -209,7 +228,7 @@ open class StoreAPI { - parameter body: (body) order placed for purchasing the pet - returns: `EventLoopFuture` of `PlaceOrder` */ - open class func placeOrder(body: Order, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func placeOrder(body: Order, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return placeOrderRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> PlaceOrder in switch response.status.code { case 200: diff --git a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/UserAPI.swift b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/UserAPI.swift index 183205907691..eb9755370e2e 100644 --- a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/UserAPI.swift +++ b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/UserAPI.swift @@ -6,12 +6,31 @@ // import Foundation +#if canImport(FoundationNetworking) +import FoundationNetworking +#endif import Vapor #if canImport(AnyCodable) import AnyCodable #endif open class UserAPI { + private let basePath: String + private let customHeaders: [String: String] + private let credential: URLCredential? + private let requestBuilderFactory: RequestBuilderFactory + + public init( + basePath: String = PetstoreClientAPI.basePath, + customHeaders: [String: String] = PetstoreClientAPI.customHeaders, + credential: URLCredential? = PetstoreClientAPI.credential, + requestBuilderFactory: RequestBuilderFactory = PetstoreClientAPI.requestBuilderFactory + ) { + self.basePath = basePath + self.customHeaders = customHeaders + self.credential = credential + self.requestBuilderFactory = requestBuilderFactory + } /** Create user @@ -20,9 +39,9 @@ open class UserAPI { - parameter body: (body) Created user object - returns: `EventLoopFuture` of `ClientResponse` */ - open class func createUserRaw(body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func createUserRaw(body: User, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/user" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -49,7 +68,7 @@ open class UserAPI { - parameter body: (body) Created user object - returns: `EventLoopFuture` of `CreateUser` */ - open class func createUser(body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func createUser(body: User, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return createUserRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> CreateUser in switch response.status.code { default: @@ -64,9 +83,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: `EventLoopFuture` of `ClientResponse` */ - open class func createUsersWithArrayInputRaw(body: [User], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func createUsersWithArrayInputRaw(body: [User], headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/user/createWithArray" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -92,7 +111,7 @@ open class UserAPI { - parameter body: (body) List of user object - returns: `EventLoopFuture` of `CreateUsersWithArrayInput` */ - open class func createUsersWithArrayInput(body: [User], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func createUsersWithArrayInput(body: [User], headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return createUsersWithArrayInputRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> CreateUsersWithArrayInput in switch response.status.code { default: @@ -107,9 +126,9 @@ open class UserAPI { - parameter body: (body) List of user object - returns: `EventLoopFuture` of `ClientResponse` */ - open class func createUsersWithListInputRaw(body: [User], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func createUsersWithListInputRaw(body: [User], headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/user/createWithList" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -135,7 +154,7 @@ open class UserAPI { - parameter body: (body) List of user object - returns: `EventLoopFuture` of `CreateUsersWithListInput` */ - open class func createUsersWithListInput(body: [User], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func createUsersWithListInput(body: [User], headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return createUsersWithListInputRaw(body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> CreateUsersWithListInput in switch response.status.code { default: @@ -151,12 +170,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be deleted - returns: `EventLoopFuture` of `ClientResponse` */ - open class func deleteUserRaw(username: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func deleteUserRaw(username: String, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { var localVariablePath = "/user/{username}" let usernamePreEscape = String(describing: username) let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -184,7 +203,7 @@ open class UserAPI { - parameter username: (path) The name that needs to be deleted - returns: `EventLoopFuture` of `DeleteUser` */ - open class func deleteUser(username: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func deleteUser(username: String, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return deleteUserRaw(username: username, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> DeleteUser in switch response.status.code { case 400: @@ -203,12 +222,12 @@ open class UserAPI { - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: `EventLoopFuture` of `ClientResponse` */ - open class func getUserByNameRaw(username: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func getUserByNameRaw(username: String, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { var localVariablePath = "/user/{username}" let usernamePreEscape = String(describing: username) let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -236,7 +255,7 @@ open class UserAPI { - parameter username: (path) The name that needs to be fetched. Use user1 for testing. - returns: `EventLoopFuture` of `GetUserByName` */ - open class func getUserByName(username: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func getUserByName(username: String, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return getUserByNameRaw(username: username, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> GetUserByName in switch response.status.code { case 200: @@ -259,9 +278,9 @@ open class UserAPI { - parameter password: (query) The password for login in clear text - returns: `EventLoopFuture` of `ClientResponse` */ - open class func loginUserRaw(username: String, password: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func loginUserRaw(username: String, password: String, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/user/login" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -299,7 +318,7 @@ open class UserAPI { - parameter password: (query) The password for login in clear text - returns: `EventLoopFuture` of `LoginUser` */ - open class func loginUser(username: String, password: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func loginUser(username: String, password: String, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return loginUserRaw(username: username, password: password, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> LoginUser in switch response.status.code { case 200: @@ -317,9 +336,9 @@ open class UserAPI { GET /user/logout - returns: `EventLoopFuture` of `ClientResponse` */ - open class func logoutUserRaw(headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func logoutUserRaw(headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { let localVariablePath = "/user/logout" - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -343,7 +362,7 @@ open class UserAPI { GET /user/logout - returns: `EventLoopFuture` of `LogoutUser` */ - open class func logoutUser(headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func logoutUser(headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return logoutUserRaw(headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> LogoutUser in switch response.status.code { default: @@ -360,12 +379,12 @@ open class UserAPI { - parameter body: (body) Updated user object - returns: `EventLoopFuture` of `ClientResponse` */ - open class func updateUserRaw(username: String, body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func updateUserRaw(username: String, body: User, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { var localVariablePath = "/user/{username}" let usernamePreEscape = String(describing: username) let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" localVariablePath = localVariablePath.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil) - let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableURLString = basePath + localVariablePath guard let localVariableApiClient = Configuration.apiClient else { fatalError("Configuration.apiClient is not set.") @@ -395,7 +414,7 @@ open class UserAPI { - parameter body: (body) Updated user object - returns: `EventLoopFuture` of `UpdateUser` */ - open class func updateUser(username: String, body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { + open func updateUser(username: String, body: User, headers: HTTPHeaders = customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture { return updateUserRaw(username: username, body: body, headers: headers, beforeSend: beforeSend).flatMapThrowing { response -> UpdateUser in switch response.status.code { case 400: diff --git a/samples/client/petstore/swift5/vaporLibrary/docs/AnotherFakeAPI.md b/samples/client/petstore/swift5/vaporLibrary/docs/AnotherFakeAPI.md index aa669f1fba61..87fb44b3df2b 100644 --- a/samples/client/petstore/swift5/vaporLibrary/docs/AnotherFakeAPI.md +++ b/samples/client/petstore/swift5/vaporLibrary/docs/AnotherFakeAPI.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **call123testSpecialTags** ```swift - open class func call123testSpecialTags(uuidTest: UUID, body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func call123testSpecialTags(uuidTest: UUID, body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` To test special tags @@ -25,7 +25,7 @@ let uuidTest = 987 // UUID | to test uuid example value let body = Client(client: "client_example") // Client | client model // To test special tags -AnotherFakeAPI.call123testSpecialTags(uuidTest: uuidTest, body: body).whenComplete { result in +AnotherFakeAPI().call123testSpecialTags(uuidTest: uuidTest, body: body).whenComplete { result in switch result { case .failure(let error): // process error diff --git a/samples/client/petstore/swift5/vaporLibrary/docs/FakeAPI.md b/samples/client/petstore/swift5/vaporLibrary/docs/FakeAPI.md index 2cb0e52af6d4..a6effae490cd 100644 --- a/samples/client/petstore/swift5/vaporLibrary/docs/FakeAPI.md +++ b/samples/client/petstore/swift5/vaporLibrary/docs/FakeAPI.md @@ -22,7 +22,7 @@ Method | HTTP request | Description # **createXmlItem** ```swift - open class func createXmlItem(xmlItem: XmlItem, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func createXmlItem(xmlItem: XmlItem, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` creates an XmlItem @@ -37,7 +37,7 @@ import PetstoreClient let xmlItem = XmlItem(attributeString: "attributeString_example", attributeNumber: 123, attributeInteger: 123, attributeBoolean: true, wrappedArray: [123], nameString: "nameString_example", nameNumber: 123, nameInteger: 123, nameBoolean: true, nameArray: [123], nameWrappedArray: [123], prefixString: "prefixString_example", prefixNumber: 123, prefixInteger: 123, prefixBoolean: true, prefixArray: [123], prefixWrappedArray: [123], namespaceString: "namespaceString_example", namespaceNumber: 123, namespaceInteger: 123, namespaceBoolean: true, namespaceArray: [123], namespaceWrappedArray: [123], prefixNsString: "prefixNsString_example", prefixNsNumber: 123, prefixNsInteger: 123, prefixNsBoolean: true, prefixNsArray: [123], prefixNsWrappedArray: [123]) // XmlItem | XmlItem Body // creates an XmlItem -FakeAPI.createXmlItem(xmlItem: xmlItem).whenComplete { result in +FakeAPI().createXmlItem(xmlItem: xmlItem).whenComplete { result in switch result { case .failure(let error): // process error @@ -81,7 +81,7 @@ No authorization required # **fakeOuterBooleanSerialize** ```swift - open class func fakeOuterBooleanSerialize(body: Bool? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func fakeOuterBooleanSerialize(body: Bool? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` @@ -95,7 +95,7 @@ import PetstoreClient let body = true // Bool | Input boolean as post body (optional) -FakeAPI.fakeOuterBooleanSerialize(body: body).whenComplete { result in +FakeAPI().fakeOuterBooleanSerialize(body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -139,7 +139,7 @@ No authorization required # **fakeOuterCompositeSerialize** ```swift - open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func fakeOuterCompositeSerialize(body: OuterComposite? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` @@ -153,7 +153,7 @@ import PetstoreClient let body = OuterComposite(myNumber: 123, myString: "myString_example", myBoolean: false) // OuterComposite | Input composite as post body (optional) -FakeAPI.fakeOuterCompositeSerialize(body: body).whenComplete { result in +FakeAPI().fakeOuterCompositeSerialize(body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -197,7 +197,7 @@ No authorization required # **fakeOuterNumberSerialize** ```swift - open class func fakeOuterNumberSerialize(body: Double? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func fakeOuterNumberSerialize(body: Double? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` @@ -211,7 +211,7 @@ import PetstoreClient let body = 987 // Double | Input number as post body (optional) -FakeAPI.fakeOuterNumberSerialize(body: body).whenComplete { result in +FakeAPI().fakeOuterNumberSerialize(body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -255,7 +255,7 @@ No authorization required # **fakeOuterStringSerialize** ```swift - open class func fakeOuterStringSerialize(body: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func fakeOuterStringSerialize(body: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` @@ -269,7 +269,7 @@ import PetstoreClient let body = "body_example" // String | Input string as post body (optional) -FakeAPI.fakeOuterStringSerialize(body: body).whenComplete { result in +FakeAPI().fakeOuterStringSerialize(body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -313,7 +313,7 @@ No authorization required # **testBodyWithFileSchema** ```swift - open class func testBodyWithFileSchema(body: FileSchemaTestClass, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func testBodyWithFileSchema(body: FileSchemaTestClass, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` @@ -327,7 +327,7 @@ import PetstoreClient let body = FileSchemaTestClass(file: File(sourceURI: "sourceURI_example"), files: [nil]) // FileSchemaTestClass | -FakeAPI.testBodyWithFileSchema(body: body).whenComplete { result in +FakeAPI().testBodyWithFileSchema(body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -371,7 +371,7 @@ No authorization required # **testBodyWithQueryParams** ```swift - open class func testBodyWithQueryParams(query: String, body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func testBodyWithQueryParams(query: String, body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` @@ -384,7 +384,7 @@ import PetstoreClient let query = "query_example" // String | let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | -FakeAPI.testBodyWithQueryParams(query: query, body: body).whenComplete { result in +FakeAPI().testBodyWithQueryParams(query: query, body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -429,7 +429,7 @@ No authorization required # **testClientModel** ```swift - open class func testClientModel(body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func testClientModel(body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` To test \"client\" model @@ -444,7 +444,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test \"client\" model -FakeAPI.testClientModel(body: body).whenComplete { result in +FakeAPI().testClientModel(body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -488,7 +488,7 @@ No authorization required # **testEndpointParameters** ```swift - open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -516,7 +516,7 @@ let password = "password_example" // String | None (optional) let callback = "callback_example" // String | None (optional) // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 -FakeAPI.testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).whenComplete { result in +FakeAPI().testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).whenComplete { result in switch result { case .failure(let error): // process error @@ -575,7 +575,7 @@ public enum TestEndpointParameters { # **testEnumParameters** ```swift - open class func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func testEnumParameters(enumHeaderStringArray: [EnumHeaderStringArray_testEnumParameters]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [EnumQueryStringArray_testEnumParameters]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [EnumFormStringArray_testEnumParameters]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` To test enum parameters @@ -597,7 +597,7 @@ let enumFormStringArray = ["inner_example"] // [String] | Form parameter enum te let enumFormString = "enumFormString_example" // String | Form parameter enum test (string) (optional) (default to .efg) // To test enum parameters -FakeAPI.testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).whenComplete { result in +FakeAPI().testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).whenComplete { result in switch result { case .failure(let error): // process error @@ -650,7 +650,7 @@ No authorization required # **testGroupParameters** ```swift - open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Fake endpoint to test group parameters (optional) @@ -670,7 +670,7 @@ let booleanGroup = true // Bool | Boolean in group parameters (optional) let int64Group = 987 // Int64 | Integer in group parameters (optional) // Fake endpoint to test group parameters (optional) -FakeAPI.testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).whenComplete { result in +FakeAPI().testGroupParameters(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).whenComplete { result in switch result { case .failure(let error): // process error @@ -719,7 +719,7 @@ No authorization required # **testInlineAdditionalProperties** ```swift - open class func testInlineAdditionalProperties(param: [String: String], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func testInlineAdditionalProperties(param: [String: String], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` test inline additionalProperties @@ -732,7 +732,7 @@ import PetstoreClient let param = "TODO" // [String: String] | request body // test inline additionalProperties -FakeAPI.testInlineAdditionalProperties(param: param).whenComplete { result in +FakeAPI().testInlineAdditionalProperties(param: param).whenComplete { result in switch result { case .failure(let error): // process error @@ -776,7 +776,7 @@ No authorization required # **testJsonFormData** ```swift - open class func testJsonFormData(param: String, param2: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func testJsonFormData(param: String, param2: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` test json serialization of form data @@ -790,7 +790,7 @@ let param = "param_example" // String | field1 let param2 = "param2_example" // String | field2 // test json serialization of form data -FakeAPI.testJsonFormData(param: param, param2: param2).whenComplete { result in +FakeAPI().testJsonFormData(param: param, param2: param2).whenComplete { result in switch result { case .failure(let error): // process error @@ -835,7 +835,7 @@ No authorization required # **testQueryParameterCollectionFormat** ```swift - open class func testQueryParameterCollectionFormat(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func testQueryParameterCollectionFormat(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` @@ -853,7 +853,7 @@ let http = ["inner_example"] // [String] | let url = ["inner_example"] // [String] | let context = ["inner_example"] // [String] | -FakeAPI.testQueryParameterCollectionFormat(pipe: pipe, ioutil: ioutil, http: http, url: url, context: context).whenComplete { result in +FakeAPI().testQueryParameterCollectionFormat(pipe: pipe, ioutil: ioutil, http: http, url: url, context: context).whenComplete { result in switch result { case .failure(let error): // process error diff --git a/samples/client/petstore/swift5/vaporLibrary/docs/FakeClassnameTags123API.md b/samples/client/petstore/swift5/vaporLibrary/docs/FakeClassnameTags123API.md index 7c462ddddbde..0d589500957b 100644 --- a/samples/client/petstore/swift5/vaporLibrary/docs/FakeClassnameTags123API.md +++ b/samples/client/petstore/swift5/vaporLibrary/docs/FakeClassnameTags123API.md @@ -9,7 +9,7 @@ Method | HTTP request | Description # **testClassname** ```swift - open class func testClassname(body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func testClassname(body: Client, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` To test class name in snake case @@ -24,7 +24,7 @@ import PetstoreClient let body = Client(client: "client_example") // Client | client model // To test class name in snake case -FakeClassnameTags123API.testClassname(body: body).whenComplete { result in +FakeClassnameTags123API().testClassname(body: body).whenComplete { result in switch result { case .failure(let error): // process error diff --git a/samples/client/petstore/swift5/vaporLibrary/docs/PetAPI.md b/samples/client/petstore/swift5/vaporLibrary/docs/PetAPI.md index 3fc719012eb5..c8fe4dd1794f 100644 --- a/samples/client/petstore/swift5/vaporLibrary/docs/PetAPI.md +++ b/samples/client/petstore/swift5/vaporLibrary/docs/PetAPI.md @@ -17,7 +17,7 @@ Method | HTTP request | Description # **addPet** ```swift - open class func addPet(body: Pet, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func addPet(body: Pet, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Add a new pet to the store @@ -30,7 +30,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Add a new pet to the store -PetAPI.addPet(body: body).whenComplete { result in +PetAPI().addPet(body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -76,7 +76,7 @@ public enum AddPet { # **deletePet** ```swift - open class func deletePet(petId: Int64, apiKey: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func deletePet(petId: Int64, apiKey: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Deletes a pet @@ -90,7 +90,7 @@ let petId = 987 // Int64 | Pet id to delete let apiKey = "apiKey_example" // String | (optional) // Deletes a pet -PetAPI.deletePet(petId: petId, apiKey: apiKey).whenComplete { result in +PetAPI().deletePet(petId: petId, apiKey: apiKey).whenComplete { result in switch result { case .failure(let error): // process error @@ -137,7 +137,7 @@ public enum DeletePet { # **findPetsByStatus** ```swift - open class func findPetsByStatus(status: [Status_findPetsByStatus], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func findPetsByStatus(status: [Status_findPetsByStatus], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Finds Pets by status @@ -152,7 +152,7 @@ import PetstoreClient let status = ["status_example"] // [String] | Status values that need to be considered for filter // Finds Pets by status -PetAPI.findPetsByStatus(status: status).whenComplete { result in +PetAPI().findPetsByStatus(status: status).whenComplete { result in switch result { case .failure(let error): // process error @@ -198,7 +198,7 @@ public enum FindPetsByStatus { # **findPetsByTags** ```swift - open class func findPetsByTags(tags: Set, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func findPetsByTags(tags: Set, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Finds Pets by tags @@ -213,7 +213,7 @@ import PetstoreClient let tags = ["inner_example"] // Set | Tags to filter by // Finds Pets by tags -PetAPI.findPetsByTags(tags: tags).whenComplete { result in +PetAPI().findPetsByTags(tags: tags).whenComplete { result in switch result { case .failure(let error): // process error @@ -259,7 +259,7 @@ public enum FindPetsByTags { # **getPetById** ```swift - open class func getPetById(petId: Int64, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func getPetById(petId: Int64, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Find pet by ID @@ -274,7 +274,7 @@ import PetstoreClient let petId = 987 // Int64 | ID of pet to return // Find pet by ID -PetAPI.getPetById(petId: petId).whenComplete { result in +PetAPI().getPetById(petId: petId).whenComplete { result in switch result { case .failure(let error): // process error @@ -322,7 +322,7 @@ public enum GetPetById { # **updatePet** ```swift - open class func updatePet(body: Pet, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func updatePet(body: Pet, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Update an existing pet @@ -335,7 +335,7 @@ import PetstoreClient let body = Pet(id: 123, category: Category(id: 123, name: "name_example"), name: "name_example", photoUrls: ["photoUrls_example"], tags: [Tag(id: 123, name: "name_example")], status: "status_example") // Pet | Pet object that needs to be added to the store // Update an existing pet -PetAPI.updatePet(body: body).whenComplete { result in +PetAPI().updatePet(body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -385,7 +385,7 @@ public enum UpdatePet { # **updatePetWithForm** ```swift - open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Updates a pet in the store with form data @@ -400,7 +400,7 @@ let name = "name_example" // String | Updated name of the pet (optional) let status = "status_example" // String | Updated status of the pet (optional) // Updates a pet in the store with form data -PetAPI.updatePetWithForm(petId: petId, name: name, status: status).whenComplete { result in +PetAPI().updatePetWithForm(petId: petId, name: name, status: status).whenComplete { result in switch result { case .failure(let error): // process error @@ -446,7 +446,7 @@ public enum UpdatePetWithForm { # **uploadFile** ```swift - open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: Data? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: Data? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` uploads an image @@ -461,7 +461,7 @@ let additionalMetadata = "additionalMetadata_example" // String | Additional dat let file = Data([9, 8, 7]) // Data | file to upload (optional) // uploads an image -PetAPI.uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file).whenComplete { result in +PetAPI().uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file).whenComplete { result in switch result { case .failure(let error): // process error @@ -507,7 +507,7 @@ public enum UploadFile { # **uploadFileWithRequiredFile** ```swift - open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: Data, additionalMetadata: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func uploadFileWithRequiredFile(petId: Int64, requiredFile: Data, additionalMetadata: String? = nil, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` uploads an image (required) @@ -522,7 +522,7 @@ let requiredFile = Data([9, 8, 7]) // Data | file to upload let additionalMetadata = "additionalMetadata_example" // String | Additional data to pass to server (optional) // uploads an image (required) -PetAPI.uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).whenComplete { result in +PetAPI().uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).whenComplete { result in switch result { case .failure(let error): // process error diff --git a/samples/client/petstore/swift5/vaporLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/vaporLibrary/docs/StoreAPI.md index 1feb1b0e0b45..150014b6a9ef 100644 --- a/samples/client/petstore/swift5/vaporLibrary/docs/StoreAPI.md +++ b/samples/client/petstore/swift5/vaporLibrary/docs/StoreAPI.md @@ -12,7 +12,7 @@ Method | HTTP request | Description # **deleteOrder** ```swift - open class func deleteOrder(orderId: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func deleteOrder(orderId: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Delete purchase order by ID @@ -27,7 +27,7 @@ import PetstoreClient let orderId = "orderId_example" // String | ID of the order that needs to be deleted // Delete purchase order by ID -StoreAPI.deleteOrder(orderId: orderId).whenComplete { result in +StoreAPI().deleteOrder(orderId: orderId).whenComplete { result in switch result { case .failure(let error): // process error @@ -73,7 +73,7 @@ No authorization required # **getInventory** ```swift - open class func getInventory(headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func getInventory(headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Returns pet inventories by status @@ -87,7 +87,7 @@ import PetstoreClient // Returns pet inventories by status -StoreAPI.getInventory().whenComplete { result in +StoreAPI().getInventory().whenComplete { result in switch result { case .failure(let error): // process error @@ -128,7 +128,7 @@ public enum GetInventory { # **getOrderById** ```swift - open class func getOrderById(orderId: Int64, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func getOrderById(orderId: Int64, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Find purchase order by ID @@ -143,7 +143,7 @@ import PetstoreClient let orderId = 987 // Int64 | ID of pet that needs to be fetched // Find purchase order by ID -StoreAPI.getOrderById(orderId: orderId).whenComplete { result in +StoreAPI().getOrderById(orderId: orderId).whenComplete { result in switch result { case .failure(let error): // process error @@ -191,7 +191,7 @@ No authorization required # **placeOrder** ```swift - open class func placeOrder(body: Order, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func placeOrder(body: Order, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Place an order for a pet @@ -204,7 +204,7 @@ import PetstoreClient let body = Order(id: 123, petId: 123, quantity: 123, shipDate: Date(), status: "status_example", complete: false) // Order | order placed for purchasing the pet // Place an order for a pet -StoreAPI.placeOrder(body: body).whenComplete { result in +StoreAPI().placeOrder(body: body).whenComplete { result in switch result { case .failure(let error): // process error diff --git a/samples/client/petstore/swift5/vaporLibrary/docs/UserAPI.md b/samples/client/petstore/swift5/vaporLibrary/docs/UserAPI.md index 83de22729cea..be97f2df2600 100644 --- a/samples/client/petstore/swift5/vaporLibrary/docs/UserAPI.md +++ b/samples/client/petstore/swift5/vaporLibrary/docs/UserAPI.md @@ -16,7 +16,7 @@ Method | HTTP request | Description # **createUser** ```swift - open class func createUser(body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func createUser(body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Create user @@ -31,7 +31,7 @@ import PetstoreClient let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Created user object // Create user -UserAPI.createUser(body: body).whenComplete { result in +UserAPI().createUser(body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -73,7 +73,7 @@ No authorization required # **createUsersWithArrayInput** ```swift - open class func createUsersWithArrayInput(body: [User], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func createUsersWithArrayInput(body: [User], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Creates list of users with given input array @@ -86,7 +86,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithArrayInput(body: body).whenComplete { result in +UserAPI().createUsersWithArrayInput(body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -128,7 +128,7 @@ No authorization required # **createUsersWithListInput** ```swift - open class func createUsersWithListInput(body: [User], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func createUsersWithListInput(body: [User], headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Creates list of users with given input array @@ -141,7 +141,7 @@ import PetstoreClient let body = [User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123)] // [User] | List of user object // Creates list of users with given input array -UserAPI.createUsersWithListInput(body: body).whenComplete { result in +UserAPI().createUsersWithListInput(body: body).whenComplete { result in switch result { case .failure(let error): // process error @@ -183,7 +183,7 @@ No authorization required # **deleteUser** ```swift - open class func deleteUser(username: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func deleteUser(username: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Delete user @@ -198,7 +198,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be deleted // Delete user -UserAPI.deleteUser(username: username).whenComplete { result in +UserAPI().deleteUser(username: username).whenComplete { result in switch result { case .failure(let error): // process error @@ -244,7 +244,7 @@ No authorization required # **getUserByName** ```swift - open class func getUserByName(username: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func getUserByName(username: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Get user by user name @@ -257,7 +257,7 @@ import PetstoreClient let username = "username_example" // String | The name that needs to be fetched. Use user1 for testing. // Get user by user name -UserAPI.getUserByName(username: username).whenComplete { result in +UserAPI().getUserByName(username: username).whenComplete { result in switch result { case .failure(let error): // process error @@ -305,7 +305,7 @@ No authorization required # **loginUser** ```swift - open class func loginUser(username: String, password: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func loginUser(username: String, password: String, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Logs user into the system @@ -319,7 +319,7 @@ let username = "username_example" // String | The user name for login let password = "password_example" // String | The password for login in clear text // Logs user into the system -UserAPI.loginUser(username: username, password: password).whenComplete { result in +UserAPI().loginUser(username: username, password: password).whenComplete { result in switch result { case .failure(let error): // process error @@ -366,7 +366,7 @@ No authorization required # **logoutUser** ```swift - open class func logoutUser(headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func logoutUser(headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Logs out current logged in user session @@ -378,7 +378,7 @@ import PetstoreClient // Logs out current logged in user session -UserAPI.logoutUser().whenComplete { result in +UserAPI().logoutUser().whenComplete { result in switch result { case .failure(let error): // process error @@ -417,7 +417,7 @@ No authorization required # **updateUser** ```swift - open class func updateUser(username: String, body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture + open func updateUser(username: String, body: User, headers: HTTPHeaders = PetstoreClientAPI.customHeaders, beforeSend: (inout ClientRequest) throws -> () = { _ in }) -> EventLoopFuture ``` Updated user @@ -433,7 +433,7 @@ let username = "username_example" // String | name that need to be deleted let body = User(id: 123, username: "username_example", firstName: "firstName_example", lastName: "lastName_example", email: "email_example", password: "password_example", phone: "phone_example", userStatus: 123) // User | Updated user object // Updated user -UserAPI.updateUser(username: username, body: body).whenComplete { result in +UserAPI().updateUser(username: username, body: body).whenComplete { result in switch result { case .failure(let error): // process error