Merge branch 'master' into not-escape-enum-value

Conflicts: modules/swagger-codegen/src/main/resources/Java/enumClass.mustache
2026-05-16 08:31:26 +00:00 · 2015-11-30 21:00:05 +08:00
parent 7731bc9d37 f2aac7a858
commit ba549a966e
99 changed files with 1251 additions and 271 deletions
--- a/modules/swagger-codegen/src/main/resources/Java/enumClass.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/enumClass.mustache
@@ -1,3 +1,4 @@
+
 public enum {{{datatypeWithEnum}}} {
  {{#allowableValues}}{{#enumVars}}{{{name}}}("{{{value}}}"){{^-last}},
  {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
@@ -9,6 +10,7 @@ public enum {{{datatypeWithEnum}}} {
  }

  @Override
+  @JsonValue
  public String toString() {
    return value;
  }