rollback swift template

modules/swagger-codegen/src/main/resources/swift/APIHelper.mustache

@@ -5,17 +5,17 @@
 //
 
 class APIHelper {
-static func rejectNil(source: [String:AnyObject?]) -> [String:AnyObject]? {
-var destination = [String:AnyObject]()
-for (key, nillableValue) in source {
-if let value: AnyObject = nillableValue {
-destination[key] = value
-}
-}
+    static func rejectNil(source: [String:AnyObject?]) -> [String:AnyObject]? {
+        var destination = [String:AnyObject]()
+        for (key, nillableValue) in source {
+            if let value: AnyObject = nillableValue {
+                destination[key] = value
+            }
+        }
 
-if destination.isEmpty {
-return nil
-}
-return destination
-}
+        if destination.isEmpty {
+            return nil
+        }
+        return destination
+    }
 }

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

@@ -8,64 +8,59 @@ import Foundation
 import PromiseKit
 
 class {{projectName}}API {
-static let basePath = "{{^basePathOverride}}{{basePath}}{{/basePathOverride}}{{basePathOverride}}"
-static var credential: NSURLCredential?
-static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
+    static let basePath = "{{^basePathOverride}}{{basePath}}{{/basePathOverride}}{{basePathOverride}}"
+    static var credential: NSURLCredential?
+    static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
 }
 
 class APIBase {
-func toParameters(encodable: JSONEncodable?) -> [String: AnyObject]? {
-let encoded: AnyObject? = encodable?.encode()
+    func toParameters(encodable: JSONEncodable?) -> [String: AnyObject]? {
+        let encoded: AnyObject? = encodable?.encode()
 
-if encoded! is [AnyObject] {
-var dictionary = [String:AnyObject]()
-for (index, item) in enumerate(encoded as! [AnyObject]) {
-dictionary["\(index)"] = item
-}
-return dictionary
-} else {
-return encoded as? [String:AnyObject]
-}
-}
+        if encoded! is [AnyObject] {
+            var dictionary = [String:AnyObject]()
+            for (index, item) in enumerate(encoded as! [AnyObject]) {
+                dictionary["\(index)"] = item
+            }
+            return dictionary
+        } else {
+            return encoded as? [String:AnyObject]
+        }
+    }
 }
 
-class RequestBuilder
-<T> {
+class RequestBuilder<T> {
     var credential: NSURLCredential?
     var headers: [String:String] = [:]
     let parameters: [String:AnyObject]?
     let isBody: Bool
     let method: String
     let URLString: String
-
+    
     required init(method: String, URLString: String, parameters: [String:AnyObject]?, isBody: Bool) {
-    self.method = method
-    self.URLString = URLString
-    self.parameters = parameters
-    self.isBody = isBody
+        self.method = method
+        self.URLString = URLString
+        self.parameters = parameters
+        self.isBody = isBody
     }
+
+    func execute() -> Promise<Response<T>>  { fatalError("Not implemented") }
 
-    func execute() -> Promise
-    <Response
-    <T>> { fatalError("Not implemented") }
-
-        func addHeader(#name: String, value: String) -> Self {
+    func addHeader(#name: String, value: String) -> Self {
         if !value.isEmpty {
-        headers[name] = value
+            headers[name] = value
         }
         return self
-        }
-
-        func addCredential() -> Self {
+    }
+    
+    func addCredential() -> Self {
         self.credential = {{projectName}}API.credential
         return self
-        }
-        }
+    }
+}
 
-        protocol RequestBuilderFactory {
-        func getBuilder
-        <T>() -> RequestBuilder
-            <T>.Type
-                }
+protocol RequestBuilderFactory {
+    func getBuilder<T>() -> RequestBuilder<T>.Type
+}
 
 

modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache

@@ -8,83 +8,72 @@ import Alamofire
 import PromiseKit
 
 class AlamofireRequestBuilderFactory: RequestBuilderFactory {
-func getBuilder
-<T>() -> RequestBuilder
-    <T>.Type {
-        return AlamofireRequestBuilder
-        <T>.self
-            }
-            }
+    func getBuilder<T>() -> RequestBuilder<T>.Type {
+        return AlamofireRequestBuilder<T>.self
+    }
+}
 
-            // Store manager to retain its reference
-            private var managerStore: [String: Alamofire.Manager] = [:]
+// Store manager to retain its reference
+private var managerStore: [String: Alamofire.Manager] = [:]
 
-            class AlamofireRequestBuilder
-            <T>: RequestBuilder
-                <T> {
-                    required init(method: String, URLString: String, parameters: [String : AnyObject]?, isBody: Bool) {
-                    super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody)
-                    }
+class AlamofireRequestBuilder<T>: RequestBuilder<T> {
+    required init(method: String, URLString: String, parameters: [String : AnyObject]?, isBody: Bool) {
+        super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody)
+    }
 
-                    override func execute() -> Promise
-                    <Response
-                    <T>> {
-                        let managerId = NSUUID().UUIDString
-                        // Create a new manager for each request to customize its request header
-                        let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
-                        configuration.HTTPAdditionalHeaders = buildHeaders()
-                        let manager = Alamofire.Manager(configuration: configuration)
-                        managerStore[managerId] = manager
+    override func execute() -> Promise<Response<T>> {
+        let managerId = NSUUID().UUIDString
+        // Create a new manager for each request to customize its request header
+        let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
+        configuration.HTTPAdditionalHeaders = buildHeaders()
+        let manager = Alamofire.Manager(configuration: configuration)
+        managerStore[managerId] = manager
 
-                        let encoding = isBody ? Alamofire.ParameterEncoding.JSON : Alamofire.ParameterEncoding.URL
-                        let request = manager.request(Alamofire.Method(rawValue: method)!, URLString, parameters:
-                        parameters, encoding: encoding)
-                        if let credential = self.credential {
-                        request.authenticate(usingCredential: credential)
-                        }
+        let encoding = isBody ? Alamofire.ParameterEncoding.JSON : Alamofire.ParameterEncoding.URL
+        let request = manager.request(Alamofire.Method(rawValue: method)!, URLString, parameters: parameters, encoding: encoding)
+        if let credential = self.credential {
+            request.authenticate(usingCredential: credential)
+        }
 
-                        let defer = Promise
-                        <Response
-                        <T>>.defer()
-                            request.responseJSON(options: .AllowFragments) { (req, res, json, error) in
-                            managerStore.removeValueForKey(managerId)
+        let defer = Promise<Response<T>>.defer()
+        request.responseJSON(options: .AllowFragments) { (req, res, json, error) in
+            managerStore.removeValueForKey(managerId)
 
-                            if let error = error {
-                            defer.reject(error)
-                            return
-                            }
-                            if res!.statusCode >= 400 {
-                            //TODO: Add error entity
-                            let error = NSError(domain: res!.URL!.URLString, code: res!.statusCode, userInfo: [:])
-                            defer.reject(error)
-                            return
-                            }
-
-                            if () is T {
-                            let response = Response(response: res!, body: () as! T)
-                            defer.fulfill(response)
-                            return
-                            }
-                            if let json: AnyObject = json {
-                            let body = Decoders.decode(clazz: T.self, source: json)
-                            let response = Response(response: res!, body: body)
-                            defer.fulfill(response)
-                            return
-                            }
+            if let error = error {
+                defer.reject(error)
+                return
+            }
+            if res!.statusCode >= 400 {
+                //TODO: Add error entity
+                let error = NSError(domain: res!.URL!.URLString, code: res!.statusCode, userInfo: [:])
+                defer.reject(error)
+                return
+            }
 
-                            defer.reject(NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable
-                            code"]))
-                            }
-                            return defer.promise
-                            }
+            if () is T {
+                let response = Response(response: res!, body: () as! T)
+                defer.fulfill(response)
+                return
+            }
+            if let json: AnyObject = json {
+                let body = Decoders.decode(clazz: T.self, source: json)
+                let response = Response(response: res!, body: body)
+                defer.fulfill(response)
+                return
+            }
+
+            defer.reject(NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"]))
+        }
+        return defer.promise
+    }
 
-                            private func buildHeaders() -> [String: AnyObject] {
-                            var httpHeaders = Manager.defaultHTTPHeaders
-                            for (key, value) in self.headers {
-                            httpHeaders[key] = value
-                            }
-                            return httpHeaders
-                            }
-                            }
+    private func buildHeaders() -> [String: AnyObject] {
+        var httpHeaders = Manager.defaultHTTPHeaders
+        for (key, value) in self.headers {
+            httpHeaders[key] = value
+        }
+        return httpHeaders
+    }
+}
 
 

modules/swagger-codegen/src/main/resources/swift/Extensions.mustache

@@ -8,46 +8,45 @@ import Alamofire
 import PromiseKit
 
 extension Bool: JSONEncodable {
-func encode() -> AnyObject { return self }
+    func encode() -> AnyObject { return self }
 }
 
 extension Float: JSONEncodable {
-func encode() -> AnyObject { return self }
+    func encode() -> AnyObject { return self }
 }
 
 extension Int: JSONEncodable {
-func encode() -> AnyObject { return self }
+    func encode() -> AnyObject { return self }
 }
 
 extension Double: JSONEncodable {
-func encode() -> AnyObject { return self }
+    func encode() -> AnyObject { return self }
 }
 
 extension String: JSONEncodable {
-func encode() -> AnyObject { return self }
+    func encode() -> AnyObject { return self }
 }
 
-private func encodeIfPossible
-<T>(object: T) -> AnyObject {
+private func encodeIfPossible<T>(object: T) -> AnyObject {
     if object is JSONEncodable {
-    return (object as! JSONEncodable).encode()
+        return (object as! JSONEncodable).encode()
     } else {
-    return object as! AnyObject
-    }
+        return object as! AnyObject
     }
+}
 
-    extension Array: JSONEncodable {
+extension Array: JSONEncodable {
     func encode() -> AnyObject {
-    return self.map(encodeIfPossible)
-    }
+        return self.map(encodeIfPossible)
     }
+}
 
-    extension Dictionary: JSONEncodable {
+extension Dictionary: JSONEncodable {
     func encode() -> AnyObject {
-    var dictionary = [NSObject:AnyObject]()
-    for (key, value) in self {
-    dictionary[key as! NSObject] = encodeIfPossible(value)
-    }
-    return dictionary
-    }
+        var dictionary = [NSObject:AnyObject]()
+        for (key, value) in self {
+            dictionary[key as! NSObject] = encodeIfPossible(value)
+        }
+        return dictionary
     }
+}