rollback swift template

2015-06-09 13:00:13 +08:00 · 2015-06-09 13:00:13 +08:00 · 410144ea1c
commit 410144ea1c
parent d8060f47a8
7 changed files with 272 additions and 314 deletions
--- a/modules/swagger-codegen/src/main/resources/swift/APIHelper.mustache
+++ b/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
+    }
 }
--- a/modules/swagger-codegen/src/main/resources/swift/APIs.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/APIs.mustache
@ -8,29 +8,28 @@ 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]?
@ -45,9 +44,7 @@ class RequestBuilder
        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 {
        if !value.isEmpty {
@ -60,12 +57,10 @@ class RequestBuilder
        self.credential = {{projectName}}API.credential
        return self
    }
-        }
+}

-        protocol RequestBuilderFactory {
-        func getBuilder
-        <T>() -> RequestBuilder
-            <T>.Type
-                }
+protocol RequestBuilderFactory {
+    func getBuilder<T>() -> RequestBuilder<T>.Type
+}


--- a/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache
@ -8,27 +8,20 @@ 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> {
+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>> {
+    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()
@ -37,15 +30,12 @@ func getBuilder
        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)
+        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()
+        let defer = Promise<Response<T>>.defer()
        request.responseJSON(options: .AllowFragments) { (req, res, json, error) in
            managerStore.removeValueForKey(managerId)

@ -72,8 +62,7 @@ func getBuilder
                return
            }
            
-                            defer.reject(NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable
-                            code"]))
+            defer.reject(NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"]))
        }
        return defer.promise
    }
@ -85,6 +74,6 @@ func getBuilder
        }
        return httpHeaders
    }
-                            }
+}


--- a/modules/swagger-codegen/src/main/resources/swift/Extensions.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/Extensions.mustache
@ -8,41 +8,40 @@ 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()
    } else {
        return object as! AnyObject
    }
-    }
+}

-    extension Array: JSONEncodable {
+extension Array: JSONEncodable {
    func encode() -> AnyObject {
        return self.map(encodeIfPossible)
    }
-    }
+}

-    extension Dictionary: JSONEncodable {
+extension Dictionary: JSONEncodable {
    func encode() -> AnyObject {
        var dictionary = [NSObject:AnyObject]()
        for (key, value) in self {
@ -50,4 +49,4 @@ private func encodeIfPossible
        }
        return dictionary
    }
-    }
+}
--- a/modules/swagger-codegen/src/main/resources/swift/Models.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/Models.mustache
@ -7,11 +7,10 @@
 import Foundation

 protocol JSONEncodable {
-func encode() -> AnyObject
+    func encode() -> AnyObject
 }

-class Response
-<T> {
+class Response<T> {
    let statusCode: Int
    let header: [String: String]
    let body: T
@ -30,29 +29,23 @@ class Response
        }
        self.init(statusCode: response.statusCode, header: header, body: body)
    }
-    }
+}

-    private var once = dispatch_once_t()
-    class Decoders {
-    static private var decoders = Dictionary
-    <String
-    , ((AnyObject) -> AnyObject)>()
+private var once = dispatch_once_t()
+class Decoders {
+    static private var decoders = Dictionary<String, ((AnyObject) -> AnyObject)>()
    
-    static func addDecoder
-    <T>(#clazz: T.Type, decoder: ((AnyObject) -> T)) {
+    static func addDecoder<T>(#clazz: T.Type, decoder: ((AnyObject) -> T)) {
        let key = "\(T.self)"
        decoders[key] = { decoder($0) as! AnyObject }
    }
    
-        static func decode
-        <T>(#clazz: [T].Type, source: AnyObject) -> [T] {
+    static func decode<T>(#clazz: [T].Type, source: AnyObject) -> [T] {
        let array = source as! [AnyObject]
        return array.map { Decoders.decode(clazz: T.self, source: $0) }
    }
    
-            static func decode
-            <T
-            , Key: Hashable>(#clazz: [Key:T].Type, source: AnyObject) -> [Key:T] {
+    static func decode<T, Key: Hashable>(#clazz: [Key:T].Type, source: AnyObject) -> [Key:T] {
        let sourceDictinoary = source as! [Key: AnyObject]
        var dictionary = [Key:T]()
        for (key, value) in sourceDictinoary {
@ -61,8 +54,7 @@ class Response
        return dictionary
    }
    
-            static func decode
-            <T>(#clazz: T.Type, source: AnyObject) -> T {
+    static func decode<T>(#clazz: T.Type, source: AnyObject) -> T {
        initialize()
        if source is T {
            return source as! T
@ -76,8 +68,7 @@ class Response
        }
    }

-                static func decodeOptional
-                <T>(#clazz: T.Type, source: AnyObject?) -> T? {
+    static func decodeOptional<T>(#clazz: T.Type, source: AnyObject?) -> T? {
        if source is NSNull {
            return nil
        }
@ -86,8 +77,7 @@ class Response
        }
    }

-                    static func decodeOptional
-                    <T>(#clazz: [T].Type, source: AnyObject?) -> [T]? {
+    static func decodeOptional<T>(#clazz: [T].Type, source: AnyObject?) -> [T]? {
        if source is NSNull {
            return nil
        }
@ -96,9 +86,7 @@ class Response
        }
    }

-                        static func decodeOptional
-                        <T
-                        , Key: Hashable>(#clazz: [Key:T].Type, source: AnyObject?) -> [Key:T]? {
+    static func decodeOptional<T, Key: Hashable>(#clazz: [Key:T].Type, source: AnyObject?) -> [Key:T]? {
        if source is NSNull {
            return nil
        }
@ -126,13 +114,11 @@ class Response
            Decoders.addDecoder(clazz: {{{classname}}}.self) { (source: AnyObject) -> {{{classname}}} in
                let sourceDictionary = source as! [NSObject:AnyObject]
                var instance = {{classname}}(){{#vars}}{{#isEnum}}
-                            instance.{{name}} = (sourceDictionary["{{name}}"] as? String).map { {{classname}}
-                            .{{datatypeWithEnum}}(rawValue: $0)! }{{#required}}!{{/required}} {{/isEnum}}{{^isEnum}}
-                            instance.{{name}} = Decoders.decode{{^required}}Optional{{/required}}(clazz: {{{baseType}}}
-                            .self, source: sourceDictionary["{{name}}"]{{#required}}!{{/required}}){{/isEnum}}{{/vars}}
+                instance.{{name}} = (sourceDictionary["{{name}}"] as? String).map { {{classname}}.{{datatypeWithEnum}}(rawValue: $0)! }{{#required}}!{{/required}} {{/isEnum}}{{^isEnum}}
+                instance.{{name}} = Decoders.decode{{^required}}Optional{{/required}}(clazz: {{{baseType}}}.self, source: sourceDictionary["{{name}}"]{{#required}}!{{/required}}){{/isEnum}}{{/vars}}
                return instance
            }{{/model}}
 			{{/models}}
        }
    }
-                        }
+}
--- a/modules/swagger-codegen/src/main/resources/swift/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/api.mustache
@ -9,10 +9,10 @@ import Alamofire
 import PromiseKit

 extension {{projectName}}API {
-{{#description}}
+    {{#description}}
    /** {{description}} */{{/description}}
-class {{classname}}: APIBase {
-{{#operation}}
+    class {{classname}}: APIBase {
+    {{#operation}}
        /**
         {{#summary}}
         {{{summary}}}
@ -28,35 +28,24 @@ class {{classname}}: APIBase {
         {{/hasParams}}{{#allParams}}
         :param: {{paramName}} ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}}{{/allParams}}

-    :returns: Promise
-    <Response
-    <{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>> {{description}}
+         :returns: Promise<Response<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>> {{description}}
         */
-        func {{operationId}}({{#allParams}}{{^secondaryParam}}#{{/secondaryParam}}{{paramName}}
-        : {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> RequestBuilder
-    <{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
-    {{^pathParams}}let{{/pathParams}}{{#pathParams}}{{^secondaryParam}}var{{/secondaryParam}}{{/pathParams}} path =
-        "{{path}}"{{#pathParams}}
-            path = path.stringByReplacingOccurrencesOfString("{{=<% %>=}}{<%paramName%>}<%={{ }}=%>", withString:
-            "\({{paramName}})", options: .LiteralSearch, range: nil){{/pathParams}}
+        func {{operationId}}({{#allParams}}{{^secondaryParam}}#{{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
+            {{^pathParams}}let{{/pathParams}}{{#pathParams}}{{^secondaryParam}}var{{/secondaryParam}}{{/pathParams}} path = "{{path}}"{{#pathParams}}
+            path = path.stringByReplacingOccurrencesOfString("{{=<% %>=}}{<%paramName%>}<%={{ }}=%>", withString: "\({{paramName}})", options: .LiteralSearch, range: nil){{/pathParams}}
            let url = {{projectName}}API.basePath + path
            {{#bodyParam}}
-            let parameters = {{paramName}}{{^required}}?{{/required}}.encode() as?
-            [String:AnyObject]{{/bodyParam}}{{^bodyParam}}
-            let nillableParameters: [String:AnyObject?] = {{^queryParams}}
-                [:]{{/queryParams}}{{#queryParams}}{{^secondaryParam}}[{{/secondaryParam}}
+            let parameters = {{paramName}}{{^required}}?{{/required}}.encode() as? [String:AnyObject]{{/bodyParam}}{{^bodyParam}}
+            let nillableParameters: [String:AnyObject?] = {{^queryParams}}[:]{{/queryParams}}{{#queryParams}}{{^secondaryParam}}[{{/secondaryParam}}
                "{{paramName}}": {{paramName}}{{#hasMore}},{{/hasMore}}{{^hasMore}}
            ]{{/hasMore}}{{/queryParams}}
            let parameters = APIHelper.rejectNil(nillableParameters){{/bodyParam}}

-        let requestBuilder: RequestBuilder
-    <{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}
-        API.requestBuilderFactory.getBuilder()
+            let requestBuilder: RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}API.requestBuilderFactory.getBuilder()

-        return requestBuilder(method: "{{httpMethod}}", URLString: url, parameters: parameters, isBody: {{^queryParams}}
-            true{{/queryParams}}{{#queryParams}}{{^secondaryParam}}false{{/secondaryParam}}{{/queryParams}})
-        }
-{{/operation}}
+            return requestBuilder(method: "{{httpMethod}}", URLString: url, parameters: parameters, isBody: {{^queryParams}}true{{/queryParams}}{{#queryParams}}{{^secondaryParam}}false{{/secondaryParam}}{{/queryParams}})
        }
+    {{/operation}}
    }
+}
 {{/operations}}
--- a/modules/swagger-codegen/src/main/resources/swift/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/model.mustache
@ -9,27 +9,27 @@ import Foundation

 {{#description}}

-    /** {{description}} */{{/description}}
+/** {{description}} */{{/description}}
 class {{classname}}: JSONEncodable {
 {{#vars}}{{#isEnum}}
    enum {{datatypeWithEnum}}: String { {{#allowableValues}}{{#values}}
        case {{enum}} = "{{raw}}"{{/values}}{{/allowableValues}}
    }
-{{/isEnum}}{{/vars}}
-{{#vars}}{{#isEnum}}{{#description}}/** {{description}} */
-{{/description}}var {{name}}: {{{datatypeWithEnum}}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}}{{^isEnum}}{{#description}}/** {{description}} */
-{{/description}}var {{name}}: {{{datatype}}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}}
-{{/vars}}
+    {{/isEnum}}{{/vars}}
+    {{#vars}}{{#isEnum}}{{#description}}/** {{description}} */
+    {{/description}}var {{name}}: {{{datatypeWithEnum}}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}}{{^isEnum}}{{#description}}/** {{description}} */
+    {{/description}}var {{name}}: {{{datatype}}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}}
+    {{/vars}}

-// MARK: JSONEncodable
-func encode() -> AnyObject {
-var nillableDictionary = [String:AnyObject?](){{#vars}}{{#isNotContainer}}{{#isPrimitiveType}}{{^isEnum}}
+    // MARK: JSONEncodable
+    func encode() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?](){{#vars}}{{#isNotContainer}}{{#isPrimitiveType}}{{^isEnum}}
        nillableDictionary["{{name}}"] = self.{{name}}{{/isEnum}}{{/isPrimitiveType}}{{#isEnum}}
        nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.rawValue{{/isEnum}}{{^isPrimitiveType}}
        nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.encode(){{/isPrimitiveType}}{{/isNotContainer}}{{#isContainer}}
        nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.encode(){{/isContainer}}{{/vars}}
-let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
-return dictionary
-}
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
 }{{/model}}
 {{/models}}