From b9bbbc6cad2efc63cf069264ecbff28be29f69e1 Mon Sep 17 00:00:00 2001 From: Joseph Zuromski Date: Wed, 6 Apr 2016 15:20:38 -0700 Subject: [PATCH] make sure to only escape an enum if the actual final variable name is going to match the enum name - now that we camelCase variable names this cuts down on the amount of enum escaping we have. --- .../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 003dbba2b79..e456a8c39d4 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 @@ -332,9 +332,9 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { // 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)) { + toVarName(name).equals(codegenProperty.datatypeWithEnum)) { codegenProperty.datatypeWithEnum = escapeReservedWord(codegenProperty.datatypeWithEnum); - } + } } return codegenProperty; }