Merge remote-tracking branch 'origin/3.2.x' into 4.0.x

This commit is contained in:
Jeremie Bresson
2018-07-18 12:32:55 +02:00
255 changed files with 8075 additions and 1622 deletions

View File

@@ -13,7 +13,8 @@ import javax.validation.constraints.*;
/**
* Animal
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true )
@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"),