From f1503e21506e834b1fab308c921dbae237481608 Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Mon, 18 Apr 2016 13:55:12 +1000 Subject: [PATCH 1/2] make swift reserved words case sensitive again --- .../main/java/io/swagger/codegen/languages/SwiftCodegen.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0725d36eec89..0e7933fd1878 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 @@ -95,9 +95,9 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { "Empty", "AnyObject") ); - setReservedWordsLowerCase( + reservedWords = new HashSet( Arrays.asList( - "class", "break", "as", "associativity", "deinit", "case", "dynamicType", "convenience", "enum", "continue", + "class", "Class", "break", "as", "associativity", "deinit", "case", "dynamicType", "convenience", "enum", "continue", "false", "dynamic", "extension", "default", "is", "didSet", "func", "do", "nil", "final", "import", "else", "self", "get", "init", "fallthrough", "Self", "infix", "internal", "for", "super", "inout", "let", "if", "true", "lazy", "operator", "in", "COLUMN", "left", "private", "return", "FILE", "mutating", "protocol", From 074ecf23e16930b0e05410b4abaed4625932c71f Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Mon, 18 Apr 2016 14:27:26 +1000 Subject: [PATCH 2/2] make reserved word checking case sensitive --- .../main/java/io/swagger/codegen/languages/SwiftCodegen.java | 5 +++++ 1 file changed, 5 insertions(+) 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 921162909d57..d279eb8ba153 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 @@ -204,6 +204,11 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { } + @Override + protected boolean isReservedWord(String word) { + return word != null && reservedWords.contains(word); //don't lowercase as super does + } + @Override public String escapeReservedWord(String name) { return "_" + name; // add an underscore to the name