Swift3 xcodewarnings (swagger-api#6298)

* added headers to makeRequest function for swift3 template

* Swift3 update to dismiss Xcode warnings

modules/swagger-codegen/src/main/resources/swift3/APIs.mustache

@@ -58,7 +58,7 @@ open class RequestBuilder<T> {
 
     open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: ErrorResponse?) -> Void) { }
 
-    public func addHeader(name: String, value: String) -> Self {
+    @discardableResult public func addHeader(name: String, value: String) -> Self {
         if !value.isEmpty {
             headers[name] = value
         }

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

@@ -209,7 +209,7 @@ class Decoders {
         }
     }
 
-    static func decodeOptional<T: RawRepresentable, U: AnyObject where T.RawValue == U>(clazz: T, source: AnyObject) -> Decoded<T?> {
+    static func decodeOptional<T: RawRepresentable, U: AnyObject>(clazz: T, source: AnyObject) -> Decoded<T?> where T.RawValue == U {
         if let value = source as? U {
             if let enumValue = T.init(rawValue: value) {
                 return .success(enumValue)

samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs.swift

@@ -58,7 +58,7 @@ open class RequestBuilder<T> {
 
     open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: ErrorResponse?) -> Void) { }
 
-    public func addHeader(name: String, value: String) -> Self {
+    @discardableResult public func addHeader(name: String, value: String) -> Self {
         if !value.isEmpty {
             headers[name] = value
         }

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

@@ -195,7 +195,7 @@ class Decoders {
         }
     }
 
-    static func decodeOptional<T: RawRepresentable, U: AnyObject where T.RawValue == U>(clazz: T, source: AnyObject) -> Decoded<T?> {
+    static func decodeOptional<T: RawRepresentable, U: AnyObject>(clazz: T, source: AnyObject) -> Decoded<T?> where T.RawValue == U {
         if let value = source as? U {
             if let enumValue = T.init(rawValue: value) {
                 return .success(enumValue)

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs.swift

@@ -58,7 +58,7 @@ open class RequestBuilder<T> {
 
     open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: ErrorResponse?) -> Void) { }
 
-    public func addHeader(name: String, value: String) -> Self {
+    @discardableResult public func addHeader(name: String, value: String) -> Self {
         if !value.isEmpty {
             headers[name] = value
         }

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

@@ -195,7 +195,7 @@ class Decoders {
         }
     }
 
-    static func decodeOptional<T: RawRepresentable, U: AnyObject where T.RawValue == U>(clazz: T, source: AnyObject) -> Decoded<T?> {
+    static func decodeOptional<T: RawRepresentable, U: AnyObject>(clazz: T, source: AnyObject) -> Decoded<T?> where T.RawValue == U {
         if let value = source as? U {
             if let enumValue = T.init(rawValue: value) {
                 return .success(enumValue)
@@ -824,7 +824,7 @@ class Decoders {
         }
         // Decoder for OuterBoolean
         Decoders.addDecoder(clazz: OuterBoolean.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<OuterBoolean> in
-            if let source = source as? Bool {
+            if let source = source as? OuterBoolean {
                 return .success(source)
             } else {
                 return .failure(.typeMismatch(expected: "Typealias OuterBoolean", actual: "\(source)"))
@@ -864,15 +864,15 @@ class Decoders {
         }
         // Decoder for OuterNumber
         Decoders.addDecoder(clazz: OuterNumber.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<OuterNumber> in
-            if let source = source as? Double {
+            if let source = source as? OuterNumber {
                 return .success(source)
             } else {
                 return .failure(.typeMismatch(expected: "Typealias OuterNumber", actual: "\(source)"))
             }
         }
         // Decoder for OuterString
         Decoders.addDecoder(clazz: OuterString.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<OuterString> in
-            if let source = source as? String {
+            if let source = source as? OuterString {
                 return .success(source)
             } else {
                 return .failure(.typeMismatch(expected: "Typealias OuterString", actual: "\(source)"))

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift

@@ -25,3 +25,4 @@ open class AdditionalPropertiesClass: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Animal.swift

@@ -25,3 +25,4 @@ open class Animal: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift

@@ -27,3 +27,4 @@ open class ApiResponse: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift

@@ -23,3 +23,4 @@ open class ArrayOfArrayOfNumberOnly: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift

@@ -23,3 +23,4 @@ open class ArrayOfNumberOnly: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift

@@ -27,3 +27,4 @@ open class ArrayTest: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift

@@ -34,3 +34,4 @@ open class Capitalization: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Cat.swift

@@ -23,3 +23,4 @@ open class Cat: Animal {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift

@@ -25,3 +25,4 @@ open class Category: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift

@@ -24,3 +24,4 @@ open class ClassModel: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Client.swift

@@ -23,3 +23,4 @@ open class Client: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Dog.swift

@@ -23,3 +23,4 @@ open class Dog: Animal {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift

@@ -33,3 +33,4 @@ open class EnumArrays: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift

@@ -42,3 +42,4 @@ open class EnumTest: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift

@@ -47,3 +47,4 @@ open class FormatTest: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift

@@ -25,3 +25,4 @@ open class HasOnlyReadOnly: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/List.swift

@@ -23,3 +23,4 @@ open class List: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/MapTest.swift

@@ -28,3 +28,4 @@ open class MapTest: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift

@@ -27,3 +27,4 @@ open class MixedPropertiesAndAdditionalPropertiesClass: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift

@@ -26,3 +26,4 @@ open class Model200Response: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Name.swift

@@ -30,3 +30,4 @@ open class Name: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift

@@ -23,3 +23,4 @@ open class NumberOnly: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift

@@ -39,3 +39,4 @@ open class Order: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterBoolean.swift

@@ -8,4 +8,17 @@
 import Foundation
 
 
-public typealias OuterBoolean = Bool
+open class OuterBoolean: JSONEncodable {
+
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    open func encodeToJSON() -> Any {
+        var nillableDictionary = [String:Any?]()
+
+        let dictionary: [String:Any] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift

@@ -27,3 +27,4 @@ open class OuterComposite: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterNumber.swift

@@ -8,4 +8,17 @@
 import Foundation
 
 
-public typealias OuterNumber = Double
+open class OuterNumber: JSONEncodable {
+
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    open func encodeToJSON() -> Any {
+        var nillableDictionary = [String:Any?]()
+
+        let dictionary: [String:Any] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterString.swift

@@ -8,4 +8,17 @@
 import Foundation
 
 
-public typealias OuterString = String
+open class OuterString: JSONEncodable {
+
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    open func encodeToJSON() -> Any {
+        var nillableDictionary = [String:Any?]()
+
+        let dictionary: [String:Any] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift

@@ -39,3 +39,4 @@ open class Pet: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift

@@ -25,3 +25,4 @@ open class ReadOnlyFirst: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Return.swift

@@ -24,3 +24,4 @@ open class Return: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift

@@ -23,3 +23,4 @@ open class SpecialModelName: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift

@@ -25,3 +25,4 @@ open class Tag: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift

@@ -38,3 +38,4 @@ open class User: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs.swift

@@ -58,7 +58,7 @@ open class RequestBuilder<T> {
 
     open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: ErrorResponse?) -> Void) { }
 
-    public func addHeader(name: String, value: String) -> Self {
+    @discardableResult public func addHeader(name: String, value: String) -> Self {
         if !value.isEmpty {
             headers[name] = value
         }

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

@@ -195,7 +195,7 @@ class Decoders {
         }
     }
 
-    static func decodeOptional<T: RawRepresentable, U: AnyObject where T.RawValue == U>(clazz: T, source: AnyObject) -> Decoded<T?> {
+    static func decodeOptional<T: RawRepresentable, U: AnyObject>(clazz: T, source: AnyObject) -> Decoded<T?> where T.RawValue == U {
         if let value = source as? U {
             if let enumValue = T.init(rawValue: value) {
                 return .success(enumValue)
@@ -824,7 +824,7 @@ class Decoders {
         }
         // Decoder for OuterBoolean
         Decoders.addDecoder(clazz: OuterBoolean.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<OuterBoolean> in
-            if let source = source as? Bool {
+            if let source = source as? OuterBoolean {
                 return .success(source)
             } else {
                 return .failure(.typeMismatch(expected: "Typealias OuterBoolean", actual: "\(source)"))
@@ -864,15 +864,15 @@ class Decoders {
         }
         // Decoder for OuterNumber
         Decoders.addDecoder(clazz: OuterNumber.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<OuterNumber> in
-            if let source = source as? Double {
+            if let source = source as? OuterNumber {
                 return .success(source)
             } else {
                 return .failure(.typeMismatch(expected: "Typealias OuterNumber", actual: "\(source)"))
             }
         }
         // Decoder for OuterString
         Decoders.addDecoder(clazz: OuterString.self) { (source: AnyObject, instance: AnyObject?) -> Decoded<OuterString> in
-            if let source = source as? String {
+            if let source = source as? OuterString {
                 return .success(source)
             } else {
                 return .failure(.typeMismatch(expected: "Typealias OuterString", actual: "\(source)"))

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift

@@ -25,3 +25,4 @@ open class AdditionalPropertiesClass: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/Animal.swift

@@ -25,3 +25,4 @@ open class Animal: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift

@@ -27,3 +27,4 @@ open class ApiResponse: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift

@@ -23,3 +23,4 @@ open class ArrayOfArrayOfNumberOnly: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift

@@ -23,3 +23,4 @@ open class ArrayOfNumberOnly: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift

@@ -27,3 +27,4 @@ open class ArrayTest: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift

@@ -34,3 +34,4 @@ open class Capitalization: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/Cat.swift

@@ -23,3 +23,4 @@ open class Cat: Animal {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/Category.swift

@@ -25,3 +25,4 @@ open class Category: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift

@@ -24,3 +24,4 @@ open class ClassModel: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/Client.swift

@@ -23,3 +23,4 @@ open class Client: JSONEncodable {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/Dog.swift

@@ -23,3 +23,4 @@ open class Dog: Animal {
         return dictionary
     }
 }
+

samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift

@@ -33,3 +33,4 @@ open class EnumArrays: JSONEncodable {
         return dictionary
     }
 }
+