Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Swift5] Fixed spelling for promise in the generated code. #7516

Merged
merged 1 commit into from
Sep 27, 2020
Merged

[Swift5] Fixed spelling for promise in the generated code. #7516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/openapi-generator/src/main/resources/swift5/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,19 +146,19 @@ extension {{projectName}}API {
{{/isDeprecated}}
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}{{{dataType}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}apiResponseQueue: DispatchQueue = {{projectName}}API.apiResponseQueue) -> AnyPublisher<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error> {
return Future<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error>.init { promisse in
return Future<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error>.init { promise in
{{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}).execute(apiResponseQueue) { result -> Void in
switch result {
{{#returnType}}
case let .success(response):
promisse(.success(response.body!))
promise(.success(response.body!))
{{/returnType}}
{{^returnType}}
case .success:
promisse(.success(()))
promise(.success(()))
{{/returnType}}
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down
6 changes: 3 additions & 3 deletions .../petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ open class AnotherFakeAPI {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Client, Error> {
return Future<Client, Error>.init { promisse in
return Future<Client, Error>.init { promise in
call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
switch result {
case let .success(response):
promisse(.success(response.body!))
promise(.success(response.body!))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down
72 changes: 36 additions & 36 deletions .../client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ open class FakeAPI {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Bool, Error> {
return Future<Bool, Error>.init { promisse in
return Future<Bool, Error>.init { promise in
fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
switch result {
case let .success(response):
promisse(.success(response.body!))
promise(.success(response.body!))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down Expand Up @@ -55,13 +55,13 @@ open class FakeAPI {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<OuterComposite, Error> {
return Future<OuterComposite, Error>.init { promisse in
return Future<OuterComposite, Error>.init { promise in
fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
switch result {
case let .success(response):
promisse(.success(response.body!))
promise(.success(response.body!))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down Expand Up @@ -93,13 +93,13 @@ open class FakeAPI {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Double, Error> {
return Future<Double, Error>.init { promisse in
return Future<Double, Error>.init { promise in
fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
switch result {
case let .success(response):
promisse(.success(response.body!))
promise(.success(response.body!))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down Expand Up @@ -131,13 +131,13 @@ open class FakeAPI {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<String, Error> {
return Future<String, Error>.init { promisse in
return Future<String, Error>.init { promise in
fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
switch result {
case let .success(response):
promisse(.success(response.body!))
promise(.success(response.body!))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down Expand Up @@ -169,13 +169,13 @@ open class FakeAPI {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Void, Error> {
return Future<Void, Error>.init { promisse in
return Future<Void, Error>.init { promise in
testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
switch result {
case .success:
promisse(.success(()))
promise(.success(()))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down Expand Up @@ -208,13 +208,13 @@ open class FakeAPI {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Void, Error> {
return Future<Void, Error>.init { promisse in
return Future<Void, Error>.init { promise in
testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result -> Void in
switch result {
case .success:
promisse(.success(()))
promise(.success(()))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down Expand Up @@ -250,13 +250,13 @@ open class FakeAPI {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Client, Error> {
return Future<Client, Error>.init { promisse in
return Future<Client, Error>.init { promise in
testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
switch result {
case let .success(response):
promisse(.success(response.body!))
promise(.success(response.body!))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down Expand Up @@ -303,13 +303,13 @@ open class FakeAPI {
*/
@available(OSX 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, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Void, Error> {
return Future<Void, Error>.init { promisse in
return Future<Void, Error>.init { promise in
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 -> Void in
switch result {
case .success:
promisse(.success(()))
promise(.success(()))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down Expand Up @@ -451,13 +451,13 @@ open class FakeAPI {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Void, Error> {
return Future<Void, Error>.init { promisse in
return Future<Void, Error>.init { promise in
testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result -> Void in
switch result {
case .success:
promisse(.success(()))
promise(.success(()))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down Expand Up @@ -520,13 +520,13 @@ open class FakeAPI {
*/
@available(OSX 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, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Void, Error> {
return Future<Void, Error>.init { promisse in
return Future<Void, Error>.init { promise in
testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result -> Void in
switch result {
case .success:
promisse(.success(()))
promise(.success(()))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down Expand Up @@ -576,13 +576,13 @@ open class FakeAPI {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Void, Error> {
return Future<Void, Error>.init { promisse in
return Future<Void, Error>.init { promise in
testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result -> Void in
switch result {
case .success:
promisse(.success(()))
promise(.success(()))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down Expand Up @@ -616,13 +616,13 @@ open class FakeAPI {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Void, Error> {
return Future<Void, Error>.init { promisse in
return Future<Void, Error>.init { promise in
testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result -> Void in
switch result {
case .success:
promisse(.success(()))
promise(.success(()))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down
6 changes: 3 additions & 3 deletions .../swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ open class FakeClassnameTags123API {
*/
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Client, Error> {
return Future<Client, Error>.init { promisse in
return Future<Client, Error>.init { promise in
testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
switch result {
case let .success(response):
promisse(.success(response.body!))
promise(.success(response.body!))
case let .failure(error):
promisse(.failure(error))
promise(.failure(error))
}
}
}.eraseToAnyPublisher()
Expand Down
Loading