diff --git a/samples/client/petstore/objc/core-data/.swagger-codegen/VERSION b/samples/client/petstore/objc/core-data/.swagger-codegen/VERSION new file mode 100644 index 000000000000..7fea99011a6f --- /dev/null +++ b/samples/client/petstore/objc/core-data/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/objc/default/.swagger-codegen/VERSION b/samples/client/petstore/objc/default/.swagger-codegen/VERSION new file mode 100644 index 000000000000..7fea99011a6f --- /dev/null +++ b/samples/client/petstore/objc/default/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift/default/.swagger-codegen/VERSION b/samples/client/petstore/swift/default/.swagger-codegen/VERSION new file mode 100644 index 000000000000..7fea99011a6f --- /dev/null +++ b/samples/client/petstore/swift/default/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift/promisekit/.swagger-codegen/VERSION b/samples/client/petstore/swift/promisekit/.swagger-codegen/VERSION new file mode 100644 index 000000000000..7fea99011a6f --- /dev/null +++ b/samples/client/petstore/swift/promisekit/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift/rxswift/.swagger-codegen/VERSION b/samples/client/petstore/swift/rxswift/.swagger-codegen/VERSION new file mode 100644 index 000000000000..7fea99011a6f --- /dev/null +++ b/samples/client/petstore/swift/rxswift/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift3/default/.swagger-codegen/VERSION b/samples/client/petstore/swift3/default/.swagger-codegen/VERSION new file mode 100644 index 000000000000..7fea99011a6f --- /dev/null +++ b/samples/client/petstore/swift3/default/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models.swift index bd15c4420d58..eab5861e8ef2 100644 --- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models.swift +++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models.swift @@ -573,11 +573,11 @@ class Decoders { // Decoder for [OuterBoolean] - Decoders.addDecoder(clazz: [OuterBoolean].self) { (source: AnyObject) -> [OuterBoolean] in + Decoders.addDecoder(clazz: [OuterBoolean].self) { (source: AnyObject, instance: AnyObject?) -> [OuterBoolean] in return Decoders.decode(clazz: [OuterBoolean].self, source: source) } // Decoder for OuterBoolean - Decoders.addDecoder(clazz: OuterBoolean.self) { (source: AnyObject) -> OuterBoolean in + Decoders.addDecoder(clazz: OuterBoolean.self) { (source: AnyObject, instance: AnyObject?) -> OuterBoolean in if let source = source as? Bool { return source } @@ -586,18 +586,18 @@ class Decoders { // Decoder for [OuterComposite] - Decoders.addDecoder(clazz: [OuterComposite].self) { (source: AnyObject) -> [OuterComposite] in + Decoders.addDecoder(clazz: [OuterComposite].self) { (source: AnyObject, instance: AnyObject?) -> [OuterComposite] in return Decoders.decode(clazz: [OuterComposite].self, source: source) } // Decoder for OuterComposite - Decoders.addDecoder(clazz: OuterComposite.self) { (source: AnyObject) -> OuterComposite in + Decoders.addDecoder(clazz: OuterComposite.self) { (source: AnyObject, instance: AnyObject?) -> OuterComposite in let sourceDictionary = source as! [AnyHashable: Any] - - let instance = OuterComposite() - instance.myNumber = Decoders.decodeOptional(clazz: OuterNumber.self, source: sourceDictionary["my_number"] as AnyObject?) - instance.myString = Decoders.decodeOptional(clazz: OuterString.self, source: sourceDictionary["my_string"] as AnyObject?) - instance.myBoolean = Decoders.decodeOptional(clazz: OuterBoolean.self, source: sourceDictionary["my_boolean"] as AnyObject?) - return instance + let result = instance == nil ? OuterComposite() : instance as! OuterComposite + + result.myNumber = Decoders.decodeOptional(clazz: OuterNumber.self, source: sourceDictionary["my_number"] as AnyObject?) + result.myString = Decoders.decodeOptional(clazz: OuterString.self, source: sourceDictionary["my_string"] as AnyObject?) + result.myBoolean = Decoders.decodeOptional(clazz: OuterBoolean.self, source: sourceDictionary["my_boolean"] as AnyObject?) + return result } @@ -617,11 +617,11 @@ class Decoders { // Decoder for [OuterNumber] - Decoders.addDecoder(clazz: [OuterNumber].self) { (source: AnyObject) -> [OuterNumber] in + Decoders.addDecoder(clazz: [OuterNumber].self) { (source: AnyObject, instance: AnyObject?) -> [OuterNumber] in return Decoders.decode(clazz: [OuterNumber].self, source: source) } // Decoder for OuterNumber - Decoders.addDecoder(clazz: OuterNumber.self) { (source: AnyObject) -> OuterNumber in + Decoders.addDecoder(clazz: OuterNumber.self) { (source: AnyObject, instance: AnyObject?) -> OuterNumber in if let source = source as? Double { return source } @@ -630,11 +630,11 @@ class Decoders { // Decoder for [OuterString] - Decoders.addDecoder(clazz: [OuterString].self) { (source: AnyObject) -> [OuterString] in + Decoders.addDecoder(clazz: [OuterString].self) { (source: AnyObject, instance: AnyObject?) -> [OuterString] in return Decoders.decode(clazz: [OuterString].self, source: source) } // Decoder for OuterString - Decoders.addDecoder(clazz: OuterString.self) { (source: AnyObject) -> OuterString in + Decoders.addDecoder(clazz: OuterString.self) { (source: AnyObject, instance: AnyObject?) -> OuterString in if let source = source as? String { return source } diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift index aa8de52bb81f..7fc6d69391c5 100644 --- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift +++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift @@ -9,6 +9,7 @@ import Foundation open class OuterComposite: JSONEncodable { + public var myNumber: OuterNumber? public var myString: OuterString? public var myBoolean: OuterBoolean? @@ -21,6 +22,7 @@ open class OuterComposite: JSONEncodable { nillableDictionary["my_number"] = self.myNumber?.encodeToJSON() nillableDictionary["my_string"] = self.myString?.encodeToJSON() nillableDictionary["my_boolean"] = self.myBoolean?.encodeToJSON() + let dictionary: [String:Any] = APIHelper.rejectNil(nillableDictionary) ?? [:] return dictionary } diff --git a/samples/client/petstore/swift3/promisekit/.swagger-codegen/VERSION b/samples/client/petstore/swift3/promisekit/.swagger-codegen/VERSION new file mode 100644 index 000000000000..7fea99011a6f --- /dev/null +++ b/samples/client/petstore/swift3/promisekit/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models.swift index bd15c4420d58..eab5861e8ef2 100644 --- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models.swift +++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models.swift @@ -573,11 +573,11 @@ class Decoders { // Decoder for [OuterBoolean] - Decoders.addDecoder(clazz: [OuterBoolean].self) { (source: AnyObject) -> [OuterBoolean] in + Decoders.addDecoder(clazz: [OuterBoolean].self) { (source: AnyObject, instance: AnyObject?) -> [OuterBoolean] in return Decoders.decode(clazz: [OuterBoolean].self, source: source) } // Decoder for OuterBoolean - Decoders.addDecoder(clazz: OuterBoolean.self) { (source: AnyObject) -> OuterBoolean in + Decoders.addDecoder(clazz: OuterBoolean.self) { (source: AnyObject, instance: AnyObject?) -> OuterBoolean in if let source = source as? Bool { return source } @@ -586,18 +586,18 @@ class Decoders { // Decoder for [OuterComposite] - Decoders.addDecoder(clazz: [OuterComposite].self) { (source: AnyObject) -> [OuterComposite] in + Decoders.addDecoder(clazz: [OuterComposite].self) { (source: AnyObject, instance: AnyObject?) -> [OuterComposite] in return Decoders.decode(clazz: [OuterComposite].self, source: source) } // Decoder for OuterComposite - Decoders.addDecoder(clazz: OuterComposite.self) { (source: AnyObject) -> OuterComposite in + Decoders.addDecoder(clazz: OuterComposite.self) { (source: AnyObject, instance: AnyObject?) -> OuterComposite in let sourceDictionary = source as! [AnyHashable: Any] - - let instance = OuterComposite() - instance.myNumber = Decoders.decodeOptional(clazz: OuterNumber.self, source: sourceDictionary["my_number"] as AnyObject?) - instance.myString = Decoders.decodeOptional(clazz: OuterString.self, source: sourceDictionary["my_string"] as AnyObject?) - instance.myBoolean = Decoders.decodeOptional(clazz: OuterBoolean.self, source: sourceDictionary["my_boolean"] as AnyObject?) - return instance + let result = instance == nil ? OuterComposite() : instance as! OuterComposite + + result.myNumber = Decoders.decodeOptional(clazz: OuterNumber.self, source: sourceDictionary["my_number"] as AnyObject?) + result.myString = Decoders.decodeOptional(clazz: OuterString.self, source: sourceDictionary["my_string"] as AnyObject?) + result.myBoolean = Decoders.decodeOptional(clazz: OuterBoolean.self, source: sourceDictionary["my_boolean"] as AnyObject?) + return result } @@ -617,11 +617,11 @@ class Decoders { // Decoder for [OuterNumber] - Decoders.addDecoder(clazz: [OuterNumber].self) { (source: AnyObject) -> [OuterNumber] in + Decoders.addDecoder(clazz: [OuterNumber].self) { (source: AnyObject, instance: AnyObject?) -> [OuterNumber] in return Decoders.decode(clazz: [OuterNumber].self, source: source) } // Decoder for OuterNumber - Decoders.addDecoder(clazz: OuterNumber.self) { (source: AnyObject) -> OuterNumber in + Decoders.addDecoder(clazz: OuterNumber.self) { (source: AnyObject, instance: AnyObject?) -> OuterNumber in if let source = source as? Double { return source } @@ -630,11 +630,11 @@ class Decoders { // Decoder for [OuterString] - Decoders.addDecoder(clazz: [OuterString].self) { (source: AnyObject) -> [OuterString] in + Decoders.addDecoder(clazz: [OuterString].self) { (source: AnyObject, instance: AnyObject?) -> [OuterString] in return Decoders.decode(clazz: [OuterString].self, source: source) } // Decoder for OuterString - Decoders.addDecoder(clazz: OuterString.self) { (source: AnyObject) -> OuterString in + Decoders.addDecoder(clazz: OuterString.self) { (source: AnyObject, instance: AnyObject?) -> OuterString in if let source = source as? String { return source } diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift index aa8de52bb81f..7fc6d69391c5 100644 --- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift +++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift @@ -9,6 +9,7 @@ import Foundation open class OuterComposite: JSONEncodable { + public var myNumber: OuterNumber? public var myString: OuterString? public var myBoolean: OuterBoolean? @@ -21,6 +22,7 @@ open class OuterComposite: JSONEncodable { nillableDictionary["my_number"] = self.myNumber?.encodeToJSON() nillableDictionary["my_string"] = self.myString?.encodeToJSON() nillableDictionary["my_boolean"] = self.myBoolean?.encodeToJSON() + let dictionary: [String:Any] = APIHelper.rejectNil(nillableDictionary) ?? [:] return dictionary } diff --git a/samples/client/petstore/swift3/rxswift/.swagger-codegen/VERSION b/samples/client/petstore/swift3/rxswift/.swagger-codegen/VERSION new file mode 100644 index 000000000000..7fea99011a6f --- /dev/null +++ b/samples/client/petstore/swift3/rxswift/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models.swift index bd15c4420d58..eab5861e8ef2 100644 --- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models.swift +++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models.swift @@ -573,11 +573,11 @@ class Decoders { // Decoder for [OuterBoolean] - Decoders.addDecoder(clazz: [OuterBoolean].self) { (source: AnyObject) -> [OuterBoolean] in + Decoders.addDecoder(clazz: [OuterBoolean].self) { (source: AnyObject, instance: AnyObject?) -> [OuterBoolean] in return Decoders.decode(clazz: [OuterBoolean].self, source: source) } // Decoder for OuterBoolean - Decoders.addDecoder(clazz: OuterBoolean.self) { (source: AnyObject) -> OuterBoolean in + Decoders.addDecoder(clazz: OuterBoolean.self) { (source: AnyObject, instance: AnyObject?) -> OuterBoolean in if let source = source as? Bool { return source } @@ -586,18 +586,18 @@ class Decoders { // Decoder for [OuterComposite] - Decoders.addDecoder(clazz: [OuterComposite].self) { (source: AnyObject) -> [OuterComposite] in + Decoders.addDecoder(clazz: [OuterComposite].self) { (source: AnyObject, instance: AnyObject?) -> [OuterComposite] in return Decoders.decode(clazz: [OuterComposite].self, source: source) } // Decoder for OuterComposite - Decoders.addDecoder(clazz: OuterComposite.self) { (source: AnyObject) -> OuterComposite in + Decoders.addDecoder(clazz: OuterComposite.self) { (source: AnyObject, instance: AnyObject?) -> OuterComposite in let sourceDictionary = source as! [AnyHashable: Any] - - let instance = OuterComposite() - instance.myNumber = Decoders.decodeOptional(clazz: OuterNumber.self, source: sourceDictionary["my_number"] as AnyObject?) - instance.myString = Decoders.decodeOptional(clazz: OuterString.self, source: sourceDictionary["my_string"] as AnyObject?) - instance.myBoolean = Decoders.decodeOptional(clazz: OuterBoolean.self, source: sourceDictionary["my_boolean"] as AnyObject?) - return instance + let result = instance == nil ? OuterComposite() : instance as! OuterComposite + + result.myNumber = Decoders.decodeOptional(clazz: OuterNumber.self, source: sourceDictionary["my_number"] as AnyObject?) + result.myString = Decoders.decodeOptional(clazz: OuterString.self, source: sourceDictionary["my_string"] as AnyObject?) + result.myBoolean = Decoders.decodeOptional(clazz: OuterBoolean.self, source: sourceDictionary["my_boolean"] as AnyObject?) + return result } @@ -617,11 +617,11 @@ class Decoders { // Decoder for [OuterNumber] - Decoders.addDecoder(clazz: [OuterNumber].self) { (source: AnyObject) -> [OuterNumber] in + Decoders.addDecoder(clazz: [OuterNumber].self) { (source: AnyObject, instance: AnyObject?) -> [OuterNumber] in return Decoders.decode(clazz: [OuterNumber].self, source: source) } // Decoder for OuterNumber - Decoders.addDecoder(clazz: OuterNumber.self) { (source: AnyObject) -> OuterNumber in + Decoders.addDecoder(clazz: OuterNumber.self) { (source: AnyObject, instance: AnyObject?) -> OuterNumber in if let source = source as? Double { return source } @@ -630,11 +630,11 @@ class Decoders { // Decoder for [OuterString] - Decoders.addDecoder(clazz: [OuterString].self) { (source: AnyObject) -> [OuterString] in + Decoders.addDecoder(clazz: [OuterString].self) { (source: AnyObject, instance: AnyObject?) -> [OuterString] in return Decoders.decode(clazz: [OuterString].self, source: source) } // Decoder for OuterString - Decoders.addDecoder(clazz: OuterString.self) { (source: AnyObject) -> OuterString in + Decoders.addDecoder(clazz: OuterString.self) { (source: AnyObject, instance: AnyObject?) -> OuterString in if let source = source as? String { return source } diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift index aa8de52bb81f..7fc6d69391c5 100644 --- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift +++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift @@ -9,6 +9,7 @@ import Foundation open class OuterComposite: JSONEncodable { + public var myNumber: OuterNumber? public var myString: OuterString? public var myBoolean: OuterBoolean? @@ -21,6 +22,7 @@ open class OuterComposite: JSONEncodable { nillableDictionary["my_number"] = self.myNumber?.encodeToJSON() nillableDictionary["my_string"] = self.myString?.encodeToJSON() nillableDictionary["my_boolean"] = self.myBoolean?.encodeToJSON() + let dictionary: [String:Any] = APIHelper.rejectNil(nillableDictionary) ?? [:] return dictionary }