diff --git a/modules/swagger-codegen/src/main/resources/Java/enumClass.mustache b/modules/swagger-codegen/src/main/resources/Java/enumClass.mustache
index fd8e8442254..0377a81f92b 100644
--- 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;
   }
diff --git a/modules/swagger-codegen/src/main/resources/Java/model.mustache b/modules/swagger-codegen/src/main/resources/Java/model.mustache
index 55aa77e30f0..ac27bca08de 100644
--- a/modules/swagger-codegen/src/main/resources/Java/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/model.mustache
@@ -9,7 +9,7 @@ import java.io.Serializable;{{/serializableModel}}
 import java.util.Objects;
 
 import io.swagger.annotations.*;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.*;
 {{#models}}
 
 {{#model}}{{#description}}