loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[swift 5] fix objc integration (#8534)

Browse Source 
* [swift 5] fix objc integration

* [swift 5] fix combine integration
This commit is contained in:
Bruno Coelho
2021-01-25 12:53:42 +00:00
committed by GitHub
parent ecf905681c
commit 17bb3750c4
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/swift5/api.mustache vendored
View File

@@ -142,10 +142,10 @@ extension {{projectName}}API {
- parameter apiResponseQueue: The queue on which api response is dispatched.
- returns: AnyPublisher<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error>
*/
#if canImport(Combine)
{{#isDeprecated}}
@available(*, deprecated, message: "This operation is deprecated.")
{{/isDeprecated}}
#if canImport(Combine)
@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}}{{^-last}}, {{/-last}}{{/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 { promise in

2
modules/openapi-generator/src/main/resources/swift5/modelObject.mustache vendored
View File

@@ -1,5 +1,5 @@
{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct {{classname}}: Codable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
{{/objcCompatible}}{{#objcCompatible}}@objc {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}} {
{{/objcCompatible}}{{#objcCompatible}}@objc {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable {
{{/objcCompatible}}
{{#allVars}}

2
samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
View File

@@ -186,8 +186,8 @@ open class PetAPI {
- parameter apiResponseQueue: The queue on which api response is dispatched.
- returns: AnyPublisher<[Pet], Error>
*/
@available(*, deprecated, message: "This operation is deprecated.")
#if canImport(Combine)
@available(*, deprecated, message: "This operation is deprecated.")
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<[Pet], Error> {
return Future<[Pet], Error>.init { promise in

2
samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
View File

@@ -7,7 +7,7 @@
import Foundation
@objc public class Category: NSObject, Codable, Hashable {
@objc public class Category: NSObject, Codable {
public var _id: Int64?
public var _idNum: NSNumber? {

2
samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
View File

@@ -7,7 +7,7 @@
import Foundation
@objc public class Pet: NSObject, Codable, Hashable {
@objc public class Pet: NSObject, Codable {
public enum Status: String, Codable, CaseIterable {
case available = "available"

2
samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
View File

@@ -7,7 +7,7 @@
import Foundation
@objc public class Tag: NSObject, Codable, Hashable {
@objc public class Tag: NSObject, Codable {
public var _id: Int64?
public var _idNum: NSNumber? {