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

Added code to templates to ensure correct generation of code for Swift3 (#5390)

Browse Source 
* Added code to templates to ensure generation of code for Swift3 that builds on both Apple platforms and Linux. Fixed a bug in the Model decoders that prevented code from building for Linux

* Ran the script to generate the PetStore API
This commit is contained in:
Vincent Coetzee 2017-05-08 12:26:30 +02:00 committed by wing328
parent f5f3dbd94a
commit 409638676e
25 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/swagger-codegen/src/main/resources/swift3/AlamofireImplementations.mustache
View File

@ -4,6 +4,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
class AlamofireRequestBuilderFactory: RequestBuilderFactory {

1
modules/swagger-codegen/src/main/resources/swift3/Extensions.mustache
View File

@ -4,6 +4,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire{{#usePromiseKit}}
import PromiseKit{{/usePromiseKit}}

2
modules/swagger-codegen/src/main/resources/swift3/Models.mustache
View File

@ -70,7 +70,7 @@ class Decoders {
static func decode<T>(clazz: T.Type, source: AnyObject, instance: AnyObject?) -> T {
initialize()
if T.self is Int32.Type && source is NSNumber {
return source.int32Value as! T;
return (source as! NSNumber).int32Value as! T;
}
if T.self is Int64.Type && source is NSNumber {
return source.int64Value as! T;

1
modules/swagger-codegen/src/main/resources/swift3/api.mustache
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire{{#usePromiseKit}}
import PromiseKit{{/usePromiseKit}}{{#useRxSwift}}
import RxSwift{{/useRxSwift}}

1
samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire

1
samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire

1
samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire

1
samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire

1
samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
View File

@ -4,6 +4,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
class AlamofireRequestBuilderFactory: RequestBuilderFactory {

1
samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Extensions.swift
View File

@ -4,6 +4,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
extension Bool: JSONEncodable {

2
samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models.swift
View File

@ -70,7 +70,7 @@ class Decoders {
static func decode<T>(clazz: T.Type, source: AnyObject, instance: AnyObject?) -> T {
initialize()
if T.self is Int32.Type && source is NSNumber {
return source.int32Value as! T;
return (source as! NSNumber).int32Value as! T;
}
if T.self is Int64.Type && source is NSNumber {
return source.int64Value as! T;

1
samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
import PromiseKit

1
samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
import PromiseKit

1
samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
import PromiseKit

1
samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
import PromiseKit

1
samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
View File

@ -4,6 +4,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
class AlamofireRequestBuilderFactory: RequestBuilderFactory {

1
samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Extensions.swift
View File

@ -4,6 +4,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
import PromiseKit

2
samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models.swift
View File

@ -70,7 +70,7 @@ class Decoders {
static func decode<T>(clazz: T.Type, source: AnyObject, instance: AnyObject?) -> T {
initialize()
if T.self is Int32.Type && source is NSNumber {
return source.int32Value as! T;
return (source as! NSNumber).int32Value as! T;
}
if T.self is Int64.Type && source is NSNumber {
return source.int64Value as! T;

1
samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
import RxSwift

1
samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
import RxSwift

1
samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
import RxSwift

1
samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
View File

@ -5,6 +5,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
import RxSwift

1
samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
View File

@ -4,6 +4,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
class AlamofireRequestBuilderFactory: RequestBuilderFactory {

1
samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Extensions.swift
View File

@ -4,6 +4,7 @@
// https://github.com/swagger-api/swagger-codegen
//
import Foundation
import Alamofire
extension Bool: JSONEncodable {

2
samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models.swift
View File

@ -70,7 +70,7 @@ class Decoders {
static func decode<T>(clazz: T.Type, source: AnyObject, instance: AnyObject?) -> T {
initialize()
if T.self is Int32.Type && source is NSNumber {
return source.int32Value as! T;
return (source as! NSNumber).int32Value as! T;
}
if T.self is Int64.Type && source is NSNumber {
return source.int64Value as! T;