From 5dcdadb751e07d39efaee17125ef6a934ce83a5f Mon Sep 17 00:00:00 2001 From: Atsushi Nagase Date: Thu, 23 Jul 2015 21:50:01 +0900 Subject: [PATCH] [Swift] tweak conditions https://github.com/ngs/swagger-codegen/commit/336bb87b5371ff857883fc5eb1da7bff62c72f3f#commitcomment-12318006 --- .../swift/AlamofireImplementations.mustache | 22 ++++++++++++------- .../main/resources/swift/Cartfile.mustache | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache b/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache index d795e9cb6c27..c1718cb6780d 100644 --- a/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache @@ -30,7 +30,6 @@ class AlamofireRequestBuilder: RequestBuilder { let encoding = isBody ? Alamofire.ParameterEncoding.JSON : Alamofire.ParameterEncoding.URL let xMethod = Alamofire.Method(rawValue: method) - var request: Request? = nil let fileKeys = parameters == nil ? [] : map(filter(parameters!) { $1.isKindOfClass(NSURL) }) { $0.0 } if fileKeys.count > 0 { @@ -38,12 +37,19 @@ class AlamofireRequestBuilder: RequestBuilder { xMethod!, URLString, headers: nil, multipartFormData: { mpForm in for (k, v) in self.parameters! { - if v.isKindOfClass(NSURL) { - mpForm.appendBodyPart(fileURL: v as! NSURL, name: k) - } else if let str = v as? NSString { - mpForm.appendBodyPart(data: str.dataUsingEncoding(NSUTF8StringEncoding)!, name: k) - } else if let num = v as? NSNumber { - mpForm.appendBodyPart(data: num.stringValue.dataUsingEncoding(NSUTF8StringEncoding)!, name: k) + switch v { + case let fileURL as NSURL: + mpForm.appendBodyPart(fileURL: fileURL, name: k) + break + case let string as NSString: + mpForm.appendBodyPart(data: string.dataUsingEncoding(NSUTF8StringEncoding)!, name: k) + break + case let number as NSNumber: + mpForm.appendBodyPart(data: number.stringValue.dataUsingEncoding(NSUTF8StringEncoding)!, name: k) + break + default: + fatalError("Unprocessable value \(v) with key \(k)") + break } } }, @@ -100,7 +106,7 @@ class AlamofireRequestBuilder: RequestBuilder { completion(response: response, erorr: nil) return } - + completion(response: nil, erorr: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"])) } } diff --git a/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache b/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache index af74617bcf20..f7838edf7ca7 100644 --- a/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache +++ b/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache @@ -1,2 +1,2 @@ -github "Alamofire/Alamofire" >= 1.2 +github "Alamofire/Alamofire" >= 1.3 github "mxcl/PromiseKit" >=1.5.3