diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/pojo.mustache
index 3ef14892d94..4eb1ff91d17 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpring/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpring/pojo.mustache
@@ -2,7 +2,7 @@
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
  */{{#description}}
 @ApiModel(description = "{{{description}}}"){{/description}}
-{{>generatedAnnotation}}
+{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}
     {{#isEnum}}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Animal.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Animal.java
index 60aaf82231f..36c209fb93b 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Animal.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Animal.java
@@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Animal
  */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true )
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
+})
 
 public class Animal   {
   @JsonProperty("className")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Animal.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Animal.java
index 90ca6505fc3..a218f0b5542 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Animal.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Animal.java
@@ -11,6 +11,11 @@ import javax.validation.constraints.*;
 /**
  * Animal
  */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true )
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
+})
 
 public class Animal   {
   @JsonProperty("className")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/model/Animal.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/model/Animal.java
index 60aaf82231f..36c209fb93b 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/model/Animal.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/model/Animal.java
@@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Animal
  */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true )
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
+})
 
 public class Animal   {
   @JsonProperty("className")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/model/Animal.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/model/Animal.java
index 60aaf82231f..36c209fb93b 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/model/Animal.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/model/Animal.java
@@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Animal
  */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true )
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
+})
 
 public class Animal   {
   @JsonProperty("className")
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Animal.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Animal.java
index 90ca6505fc3..a218f0b5542 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Animal.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Animal.java
@@ -11,6 +11,11 @@ import javax.validation.constraints.*;
 /**
  * Animal
  */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true )
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
+})
 
 public class Animal   {
   @JsonProperty("className")