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

fix(swift3): fix infinite loop with inheritance and check if parent decoder exists before calling (#5416)

Browse Source
This commit is contained in:
Julien Fouilhé
2017-04-20 16:54:35 +02:00
committed by wing328
parent 6359c064f3
commit edb80df0ba
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,7 +173,7 @@ class Decoders {
Decoders.addDecoder(clazz: Animal.self) { (source: AnyObject, instance: AnyObject?) -> Animal in
let sourceDictionary = source as! [AnyHashable: Any]
// Check discriminator to support inheritance
if let discriminator = sourceDictionary["className"] as? String, discriminator != "Animal"{
if let discriminator = sourceDictionary["className"] as? String, instance == nil && discriminator != "Animal" {
return Decoders.decode(clazz: Animal.self, discriminator: discriminator, source: source)
}
@@ -289,7 +289,9 @@ class Decoders {
let sourceDictionary = source as! [AnyHashable: Any]
let result = instance == nil ? Cat() : instance as! Cat
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
if decoders["\(Animal.self)"] != nil {
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
}
result.className = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["className"] as AnyObject?)
result.color = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["color"] as AnyObject?)
@@ -353,7 +355,9 @@ class Decoders {
let sourceDictionary = source as! [AnyHashable: Any]
let result = instance == nil ? Dog() : instance as! Dog
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
if decoders["\(Animal.self)"] != nil {
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
}
result.className = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["className"] as AnyObject?)
result.color = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["color"] as AnyObject?)

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

@@ -173,7 +173,7 @@ class Decoders {
Decoders.addDecoder(clazz: Animal.self) { (source: AnyObject, instance: AnyObject?) -> Animal in
let sourceDictionary = source as! [AnyHashable: Any]
// Check discriminator to support inheritance
if let discriminator = sourceDictionary["className"] as? String, discriminator != "Animal"{
if let discriminator = sourceDictionary["className"] as? String, instance == nil && discriminator != "Animal" {
return Decoders.decode(clazz: Animal.self, discriminator: discriminator, source: source)
}
@@ -289,7 +289,9 @@ class Decoders {
let sourceDictionary = source as! [AnyHashable: Any]
let result = instance == nil ? Cat() : instance as! Cat
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
if decoders["\(Animal.self)"] != nil {
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
}
result.className = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["className"] as AnyObject?)
result.color = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["color"] as AnyObject?)
@@ -353,7 +355,9 @@ class Decoders {
let sourceDictionary = source as! [AnyHashable: Any]
let result = instance == nil ? Dog() : instance as! Dog
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
if decoders["\(Animal.self)"] != nil {
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
}
result.className = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["className"] as AnyObject?)
result.color = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["color"] as AnyObject?)

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

@@ -173,7 +173,7 @@ class Decoders {
Decoders.addDecoder(clazz: Animal.self) { (source: AnyObject, instance: AnyObject?) -> Animal in
let sourceDictionary = source as! [AnyHashable: Any]
// Check discriminator to support inheritance
if let discriminator = sourceDictionary["className"] as? String, discriminator != "Animal"{
if let discriminator = sourceDictionary["className"] as? String, instance == nil && discriminator != "Animal" {
return Decoders.decode(clazz: Animal.self, discriminator: discriminator, source: source)
}
@@ -289,7 +289,9 @@ class Decoders {
let sourceDictionary = source as! [AnyHashable: Any]
let result = instance == nil ? Cat() : instance as! Cat
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
if decoders["\(Animal.self)"] != nil {
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
}
result.className = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["className"] as AnyObject?)
result.color = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["color"] as AnyObject?)
@@ -353,7 +355,9 @@ class Decoders {
let sourceDictionary = source as! [AnyHashable: Any]
let result = instance == nil ? Dog() : instance as! Dog
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
if decoders["\(Animal.self)"] != nil {
_ = Decoders.decode(clazz: Animal.self, source: source, instance: result)
}
result.className = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["className"] as AnyObject?)
result.color = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["color"] as AnyObject?)