From 3de7a4ba85a6c0396b0a7ce915fe17c5ef649c27 Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Mon, 18 Apr 2016 15:24:37 +1000 Subject: [PATCH 1/2] Append reserved swift enum type with "Enum" --- .../main/java/io/swagger/codegen/languages/SwiftCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 aa6d73f3abf..f1be1368a9a 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 @@ -337,7 +337,7 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { // Swift compiler will generate an error if (isReservedWord(codegenProperty.datatypeWithEnum) || name.equals(codegenProperty.datatypeWithEnum)) { - codegenProperty.datatypeWithEnum = escapeReservedWord(codegenProperty.datatypeWithEnum); + codegenProperty.datatypeWithEnum = codegenProperty.datatypeWithEnum + "Enum"; } } return codegenProperty; From 491ceb898772032c1c057a60af9eb1ea2d0fc413 Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Tue, 19 Apr 2016 10:04:11 +1000 Subject: [PATCH 2/2] improve line indentation --- .../main/java/io/swagger/codegen/languages/SwiftCodegen.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 f1be1368a9a..f60953c48b7 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 @@ -335,10 +335,9 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { // Ensure that the enum type doesn't match a reserved word or // the variable name doesn't match the generated enum type or the // Swift compiler will generate an error - if (isReservedWord(codegenProperty.datatypeWithEnum) || - name.equals(codegenProperty.datatypeWithEnum)) { + if (isReservedWord(codegenProperty.datatypeWithEnum) || name.equals(codegenProperty.datatypeWithEnum)) { codegenProperty.datatypeWithEnum = codegenProperty.datatypeWithEnum + "Enum"; - } + } } return codegenProperty; }