From 7731bc9d370c79f6a12ab9ff93d7c61e1a816346 Mon Sep 17 00:00:00 2001 From: xhh Date: Fri, 27 Nov 2015 17:32:31 +0800 Subject: [PATCH] Fix issue of escaping HTML elements in enum values See swagger-api/swagger-editor#727 --- .../src/main/resources/Java/enumClass.mustache | 6 +++--- .../Java/libraries/okhttp-gson/enumClass.mustache | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/enumClass.mustache b/modules/swagger-codegen/src/main/resources/Java/enumClass.mustache index fd8e8442254..61420a71a54 100644 --- a/modules/swagger-codegen/src/main/resources/Java/enumClass.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/enumClass.mustache @@ -1,10 +1,10 @@ -public enum {{datatypeWithEnum}} { - {{#allowableValues}}{{#enumVars}}{{name}}("{{value}}"){{^-last}}, +public enum {{{datatypeWithEnum}}} { + {{#allowableValues}}{{#enumVars}}{{{name}}}("{{{value}}}"){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} private String value; - {{datatypeWithEnum}}(String value) { + {{{datatypeWithEnum}}}(String value) { this.value = value; } diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/enumClass.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/enumClass.mustache index bb1109c27ca..0fed02b67a3 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/enumClass.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/enumClass.mustache @@ -1,12 +1,12 @@ -public enum {{datatypeWithEnum}} { - {{#allowableValues}}{{#enumVars}}@SerializedName("{{value}}") - {{name}}("{{value}}"){{^-last}}, +public enum {{{datatypeWithEnum}}} { + {{#allowableValues}}{{#enumVars}}@SerializedName("{{{value}}}") + {{{name}}}("{{{value}}}"){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} private String value; - {{datatypeWithEnum}}(String value) { + {{{datatypeWithEnum}}}(String value) { this.value = value; }