From 122af808811af5a35f7ba5f3cf6cc726d61e6bca Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 5 Aug 2016 11:28:07 +0800 Subject: [PATCH] better symbol mapping for enum name --- .../src/main/java/io/swagger/codegen/DefaultCodegen.java | 4 +++- .../java/io/swagger/codegen/languages/JavaClientCodegen.java | 4 +--- .../java/io/swagger/codegen/java/AbstractJavaCodegenTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index c3dea77c22ed..c00e99172158 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -804,10 +804,12 @@ public class DefaultCodegen { specialCharReplacements.put(":", "Colon"); specialCharReplacements.put(">", "Greater_Than"); specialCharReplacements.put("<", "Less_Than"); + specialCharReplacements.put(".", "Period"); + specialCharReplacements.put("_", "Underscore"); specialCharReplacements.put("<=", "Less_Than_Or_Equal_To"); specialCharReplacements.put(">=", "Greater_Than_Or_Equal_To"); - specialCharReplacements.put("!=", "Greater_Than_Or_Equal_To"); + specialCharReplacements.put("!=", "Not_Equal"); } /** diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 9b97028cafa6..db181498586a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -184,12 +184,10 @@ public class JavaClientCodegen extends AbstractJavaCodegen { model.imports.add("SerializedName"); } } else { // enum class - //Needed imports for Jackson based libraries + //Needed imports for Jackson's JsonCreator if(additionalProperties.containsKey("jackson")) { model.imports.add("JsonCreator"); - model.imports.add("JsonProperty"); } - model.imports.add("JsonCreator"); } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/AbstractJavaCodegenTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/AbstractJavaCodegenTest.java index bd87e14d5108..61da755f1464 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/AbstractJavaCodegenTest.java @@ -27,9 +27,9 @@ public class AbstractJavaCodegenTest { @Test public void toEnumVarNameShouldNotShortenUnderScore() throws Exception { - Assert.assertEquals("_", fakeJavaCodegen.toEnumVarName("_", "String")); + Assert.assertEquals("UNDERSCORE", fakeJavaCodegen.toEnumVarName("_", "String")); Assert.assertEquals("__", fakeJavaCodegen.toEnumVarName("__", "String")); Assert.assertEquals("__", fakeJavaCodegen.toEnumVarName("_,.", "String")); } -} \ No newline at end of file +}