[Swift 4] Add createURLRequest method

modules/openapi-generator/src/main/resources/swift4/AlamofireImplementations.mustache

@@ -64,6 +64,15 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return Alamofire.SessionManager(configuration: configuration)
     }
 
+    /**
+     May be overridden by a subclass if you want to custom request constructor.
+     */
+    open func createURLRequest() -> URLRequest? {
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        guard let originalRequest = try? URLRequest(url: URLString, method: HTTPMethod(rawValue: method)!, headers: buildHeaders()) else { return nil }
+        return try? encoding.encode(originalRequest, with: parameters)
+    }
+
     /**
      May be overridden by a subclass if you want to control the Content-Type
      that is given to an uploaded form part.

samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift

@@ -64,6 +64,15 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return Alamofire.SessionManager(configuration: configuration)
     }
 
+    /**
+     May be overridden by a subclass if you want to custom request constructor.
+     */
+    open func createURLRequest() -> URLRequest? {
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        guard let originalRequest = try? URLRequest(url: URLString, method: HTTPMethod(rawValue: method)!, headers: buildHeaders()) else { return nil }
+        return try? encoding.encode(originalRequest, with: parameters)
+    }
+
     /**
      May be overridden by a subclass if you want to control the Content-Type
      that is given to an uploaded form part.

samples/client/petstore/swift4/objcCompatible/.openapi-generator/VERSION

@@ -1 +1 @@
-3.3.4-SNAPSHOT
+4.0.0-SNAPSHOT

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift

@@ -64,6 +64,15 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return Alamofire.SessionManager(configuration: configuration)
     }
 
+    /**
+     May be overridden by a subclass if you want to custom request constructor.
+     */
+    open func createURLRequest() -> URLRequest? {
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        guard let originalRequest = try? URLRequest(url: URLString, method: HTTPMethod(rawValue: method)!, headers: buildHeaders()) else { return nil }
+        return try? encoding.encode(originalRequest, with: parameters)
+    }
+
     /**
      May be overridden by a subclass if you want to control the Content-Type
      that is given to an uploaded form part.

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift

@@ -12,11 +12,6 @@ import Foundation
 public struct ApiResponse: Codable {
 
     public var code: Int?
-    public var codeNum: NSNumber? {
-        get {
-            return code.map({ return NSNumber(value: $0) })
-        }
-    }
     public var type: String?
     public var message: String?
 

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift

@@ -12,11 +12,6 @@ import Foundation
 public struct Category: Codable {
 
     public var _id: Int64?
-    public var _idNum: NSNumber? {
-        get {
-            return _id.map({ return NSNumber(value: $0) })
-        }
-    }
     public var name: String = "default-name"
 
     public init(_id: Int64?, name: String) {

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift

@@ -12,41 +12,11 @@ import Foundation
 public struct FormatTest: Codable {
 
     public var integer: Int?
-    public var integerNum: NSNumber? {
-        get {
-            return integer.map({ return NSNumber(value: $0) })
-        }
-    }
     public var int32: Int?
-    public var int32Num: NSNumber? {
-        get {
-            return int32.map({ return NSNumber(value: $0) })
-        }
-    }
     public var int64: Int64?
-    public var int64Num: NSNumber? {
-        get {
-            return int64.map({ return NSNumber(value: $0) })
-        }
-    }
     public var number: Double
-    public var numberNum: NSNumber? {
-        get {
-            return number.map({ return NSNumber(value: $0) })
-        }
-    }
     public var float: Float?
-    public var floatNum: NSNumber? {
-        get {
-            return float.map({ return NSNumber(value: $0) })
-        }
-    }
     public var double: Double?
-    public var doubleNum: NSNumber? {
-        get {
-            return double.map({ return NSNumber(value: $0) })
-        }
-    }
     public var string: String?
     public var byte: Data
     public var binary: URL?

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift

@@ -13,11 +13,6 @@ import Foundation
 public struct Model200Response: Codable {
 
     public var name: Int?
-    public var nameNum: NSNumber? {
-        get {
-            return name.map({ return NSNumber(value: $0) })
-        }
-    }
     public var _class: String?
 
     public init(name: Int?, _class: String?) {

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift

@@ -13,24 +13,9 @@ import Foundation
 public struct Name: Codable {
 
     public var name: Int
-    public var nameNum: NSNumber? {
-        get {
-            return name.map({ return NSNumber(value: $0) })
-        }
-    }
     public var snakeCase: Int?
-    public var snakeCaseNum: NSNumber? {
-        get {
-            return snakeCase.map({ return NSNumber(value: $0) })
-        }
-    }
     public var property: String?
     public var _123number: Int?
-    public var _123numberNum: NSNumber? {
-        get {
-            return _123number.map({ return NSNumber(value: $0) })
-        }
-    }
 
     public init(name: Int, snakeCase: Int?, property: String?, _123number: Int?) {
         self.name = name

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift

@@ -12,11 +12,6 @@ import Foundation
 public struct NumberOnly: Codable {
 
     public var justNumber: Double?
-    public var justNumberNum: NSNumber? {
-        get {
-            return justNumber.map({ return NSNumber(value: $0) })
-        }
-    }
 
     public init(justNumber: Double?) {
         self.justNumber = justNumber

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Order.swift

@@ -17,32 +17,12 @@ public struct Order: Codable {
         case delivered = "delivered"
     }
     public var _id: Int64?
-    public var _idNum: NSNumber? {
-        get {
-            return _id.map({ return NSNumber(value: $0) })
-        }
-    }
     public var petId: Int64?
-    public var petIdNum: NSNumber? {
-        get {
-            return petId.map({ return NSNumber(value: $0) })
-        }
-    }
     public var quantity: Int?
-    public var quantityNum: NSNumber? {
-        get {
-            return quantity.map({ return NSNumber(value: $0) })
-        }
-    }
     public var shipDate: Date?
     /** Order Status */
     public var status: Status?
     public var complete: Bool? = false
-    public var completeNum: NSNumber? {
-        get {
-            return complete.map({ return NSNumber(value: $0) })
-        }
-    }
 
     public init(_id: Int64?, petId: Int64?, quantity: Int?, shipDate: Date?, status: Status?, complete: Bool?) {
         self._id = _id

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift

@@ -12,18 +12,8 @@ import Foundation
 public struct OuterComposite: Codable {
 
     public var myNumber: Double?
-    public var myNumberNum: NSNumber? {
-        get {
-            return myNumber.map({ return NSNumber(value: $0) })
-        }
-    }
     public var myString: String?
     public var myBoolean: Bool?
-    public var myBooleanNum: NSNumber? {
-        get {
-            return myBoolean.map({ return NSNumber(value: $0) })
-        }
-    }
 
     public init(myNumber: Double?, myString: String?, myBoolean: Bool?) {
         self.myNumber = myNumber

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift

@@ -17,11 +17,6 @@ public struct Pet: Codable {
         case sold = "sold"
     }
     public var _id: Int64?
-    public var _idNum: NSNumber? {
-        get {
-            return _id.map({ return NSNumber(value: $0) })
-        }
-    }
     public var category: Category?
     public var name: String
     public var photoUrls: [String]

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift

@@ -13,11 +13,6 @@ import Foundation
 public struct Return: Codable {
 
     public var _return: Int?
-    public var _returnNum: NSNumber? {
-        get {
-            return _return.map({ return NSNumber(value: $0) })
-        }
-    }
 
     public init(_return: Int?) {
         self._return = _return

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift

@@ -12,11 +12,6 @@ import Foundation
 public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
-    public var specialPropertyNameNum: NSNumber? {
-        get {
-            return specialPropertyName.map({ return NSNumber(value: $0) })
-        }
-    }
 
     public init(specialPropertyName: Int64?) {
         self.specialPropertyName = specialPropertyName

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift

@@ -12,11 +12,6 @@ import Foundation
 public struct Tag: Codable {
 
     public var _id: Int64?
-    public var _idNum: NSNumber? {
-        get {
-            return _id.map({ return NSNumber(value: $0) })
-        }
-    }
     public var name: String?
 
     public init(_id: Int64?, name: String?) {

samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/User.swift

@@ -12,11 +12,6 @@ import Foundation
 public struct User: Codable {
 
     public var _id: Int64?
-    public var _idNum: NSNumber? {
-        get {
-            return _id.map({ return NSNumber(value: $0) })
-        }
-    }
     public var username: String?
     public var firstName: String?
     public var lastName: String?
@@ -25,11 +20,6 @@ public struct User: Codable {
     public var phone: String?
     /** User Status */
     public var userStatus: Int?
-    public var userStatusNum: NSNumber? {
-        get {
-            return userStatus.map({ return NSNumber(value: $0) })
-        }
-    }
 
     public init(_id: Int64?, username: String?, firstName: String?, lastName: String?, email: String?, password: String?, phone: String?, userStatus: Int?) {
         self._id = _id

samples/client/petstore/swift4/promisekit/.openapi-generator/VERSION

@@ -1 +1 @@
-3.3.4-SNAPSHOT
+4.0.0-SNAPSHOT

samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift

@@ -64,6 +64,15 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return Alamofire.SessionManager(configuration: configuration)
     }
 
+    /**
+     May be overridden by a subclass if you want to custom request constructor.
+     */
+    open func createURLRequest() -> URLRequest? {
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        guard let originalRequest = try? URLRequest(url: URLString, method: HTTPMethod(rawValue: method)!, headers: buildHeaders()) else { return nil }
+        return try? encoding.encode(originalRequest, with: parameters)
+    }
+
     /**
      May be overridden by a subclass if you want to control the Content-Type
      that is given to an uploaded form part.

samples/client/petstore/swift4/rxswift/.openapi-generator/VERSION

@@ -1 +1 @@
-3.3.4-SNAPSHOT
+4.0.0-SNAPSHOT

samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift

@@ -64,6 +64,15 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return Alamofire.SessionManager(configuration: configuration)
     }
 
+    /**
+     May be overridden by a subclass if you want to custom request constructor.
+     */
+    open func createURLRequest() -> URLRequest? {
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        guard let originalRequest = try? URLRequest(url: URLString, method: HTTPMethod(rawValue: method)!, headers: buildHeaders()) else { return nil }
+        return try? encoding.encode(originalRequest, with: parameters)
+    }
+
     /**
      May be overridden by a subclass if you want to control the Content-Type
      that is given to an uploaded form part.

samples/client/petstore/swift4/unwrapRequired/.openapi-generator/VERSION

@@ -1 +1 @@
-3.3.4-SNAPSHOT
+4.0.0-SNAPSHOT

samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift

@@ -64,6 +64,15 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return Alamofire.SessionManager(configuration: configuration)
     }
 
+    /**
+     May be overridden by a subclass if you want to custom request constructor.
+     */
+    open func createURLRequest() -> URLRequest? {
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        guard let originalRequest = try? URLRequest(url: URLString, method: HTTPMethod(rawValue: method)!, headers: buildHeaders()) else { return nil }
+        return try? encoding.encode(originalRequest, with: parameters)
+    }
+
     /**
      May be overridden by a subclass if you want to control the Content-Type
      that is given to an uploaded form part.

samples/client/test/swift4/default/.openapi-generator/VERSION

@@ -1 +1 @@
-3.3.4-SNAPSHOT
+4.0.0-SNAPSHOT

samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/AlamofireImplementations.swift

@@ -64,6 +64,15 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return Alamofire.SessionManager(configuration: configuration)
     }
 
+    /**
+     May be overridden by a subclass if you want to custom request constructor.
+     */
+    open func createURLRequest() -> URLRequest? {
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        guard let originalRequest = try? URLRequest(url: URLString, method: HTTPMethod(rawValue: method)!, headers: buildHeaders()) else { return nil }
+        return try? encoding.encode(originalRequest, with: parameters)
+    }
+
     /**
      May be overridden by a subclass if you want to control the Content-Type
      that is given to an uploaded form part.

samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClass.swift

@@ -12,14 +12,10 @@ import Foundation
 
 public struct SampleSubClass: Codable {
 
-    public var baseClassStringProp: String?
-    public var baseClassIntegerProp: Int?
     public var subClassStringProp: String?
     public var subClassIntegerProp: Int?
 
-    public init(baseClassStringProp: String?, baseClassIntegerProp: Int?, subClassStringProp: String?, subClassIntegerProp: Int?) {
-        self.baseClassStringProp = baseClassStringProp
-        self.baseClassIntegerProp = baseClassIntegerProp
+    public init(subClassStringProp: String?, subClassIntegerProp: Int?) {
         self.subClassStringProp = subClassStringProp
         self.subClassIntegerProp = subClassIntegerProp
     }