From 805433a22eb3e3249de8fca1720516db9a143b4a Mon Sep 17 00:00:00 2001
From: Thomas Gilbert <thomas.gilbert@alexandra.dk>
Date: Sat, 27 Feb 2016 15:31:40 +0100
Subject: [PATCH] Better handling of variable and parameter names

---
 CONTRIBUTING.md                               |  1 +
 .../codegen/languages/SwiftCodegen.java       | 47 +++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7758d8166d11..35294347b002 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,6 +36,7 @@ Code change should conform to the programming style guide of the respective lang
 - PHP: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
 - Python: https://www.python.org/dev/peps/pep-0008/
 - Ruby: https://github.com/bbatsov/ruby-style-guide
+- Swift: https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/Swift_Programming_Language/TheBasics.html
 - TypeScript: https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines
 
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
index 3650cf89afe0..f0b32e6e14de 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
@@ -308,6 +308,53 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig {
     return camelize(sanitizeName(operationId), true);
   }
 
+  @Override
+  public String toVarName(String name) {
+    // sanitize name
+    name = sanitizeName(name);
+
+    // if it's all uppper case, do nothing
+    if (name.matches("^[A-Z_]*$")) {
+        return name;
+    }
+
+    // camelize the variable name
+    // pet_id => PetId
+    name = camelize(name, true);
+
+    // for reserved word or word starting with number, append _
+    if (isReservedWord(name) || name.matches("^\\d.*")) {
+        name = escapeReservedWord(name);
+    }
+
+    return name;
+  }
+
+  @Override
+  public String toParamName(String name) {
+    // sanitize name
+    name = sanitizeName(name);
+
+    // replace - with _ e.g. created-at => created_at
+    name = name.replaceAll("-", "_");
+
+    // if it's all uppper case, do nothing
+    if (name.matches("^[A-Z_]*$")) {
+        return name;
+    }
+
+    // camelize(lower) the variable name
+    // pet_id => petId
+    name = camelize(name, true);
+
+    // for reserved word or word starting with number, append _
+    if (isReservedWord(name) || name.matches("^\\d.*")) {
+        name = escapeReservedWord(name);
+    }
+
+    return name;
+  }
+
   @Override
   public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions, Swagger swagger) {
     path = normalizePath(path); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.