From 9cf1835230b82991d2e4651b8895b62f2f0a3d02 Mon Sep 17 00:00:00 2001
From: kubo_takaichi <kubo_takaichi@cyberagent.co.jp>
Date: Mon, 18 May 2015 21:59:11 +0900
Subject: [PATCH] Fix bug

---
 .../com/wordnik/swagger/codegen/languages/SwiftGenerator.java   | 1 +
 .../swagger-codegen/src/main/resources/swift/Models.mustache    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwiftGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwiftGenerator.java
index 53097c357365..e763c51e1acd 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwiftGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwiftGenerator.java
@@ -99,6 +99,7 @@ public class SwiftGenerator extends DefaultCodegen implements CodegenConfig {
     typeMapping.put("array", "Array");
     typeMapping.put("List", "Array");
     typeMapping.put("map", "Dictionary");
+    typeMapping.put("date", "NSDate");
     typeMapping.put("Date", "NSDate");
     typeMapping.put("DateTime", "NSDate");
     typeMapping.put("boolean", "Bool");
diff --git a/modules/swagger-codegen/src/main/resources/swift/Models.mustache b/modules/swagger-codegen/src/main/resources/swift/Models.mustache
index 8bdd72577dbd..100ba1f4c2de 100644
--- a/modules/swagger-codegen/src/main/resources/swift/Models.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/Models.mustache
@@ -100,7 +100,7 @@ class Decoders {
             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}} = (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}}