Merge remote-tracking branch 'origin/4.2.x' into 5.0.x

samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderExample.java

@@ -20,6 +20,9 @@ public class TypeHolderExample   {
   @JsonProperty("number_item")
   private BigDecimal numberItem;
 
+  @JsonProperty("float_item")
+  private Float floatItem;
+
   @JsonProperty("integer_item")
   private Integer integerItem;
 
@@ -66,6 +69,24 @@ public class TypeHolderExample   {
     this.numberItem = numberItem;
   }
 
+  public TypeHolderExample floatItem(Float floatItem) {
+    this.floatItem = floatItem;
+    return this;
+  }
+
+   /**
+   * Get floatItem
+   * @return floatItem
+  **/
+  @NotNull
+  public Float getFloatItem() {
+    return floatItem;
+  }
+
+  public void setFloatItem(Float floatItem) {
+    this.floatItem = floatItem;
+  }
+
   public TypeHolderExample integerItem(Integer integerItem) {
     this.integerItem = integerItem;
     return this;
@@ -137,6 +158,7 @@ public class TypeHolderExample   {
     TypeHolderExample typeHolderExample = (TypeHolderExample) o;
     return Objects.equals(stringItem, typeHolderExample.stringItem) &&
         Objects.equals(numberItem, typeHolderExample.numberItem) &&
+        Objects.equals(floatItem, typeHolderExample.floatItem) &&
         Objects.equals(integerItem, typeHolderExample.integerItem) &&
         Objects.equals(boolItem, typeHolderExample.boolItem) &&
         Objects.equals(arrayItem, typeHolderExample.arrayItem);
@@ -144,7 +166,7 @@ public class TypeHolderExample   {
 
   @Override
   public int hashCode() {
-    return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
+    return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
   }
 
   @SuppressWarnings("StringBufferReplaceableByString")
@@ -155,6 +177,7 @@ public class TypeHolderExample   {
     
     sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
     sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
+    sb.append("    floatItem: ").append(toIndentedString(floatItem)).append("\n");
     sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
     sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
     sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");

samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json

@@ -2534,6 +2534,11 @@
             "example" : 1.234,
             "type" : "number"
           },
+          "float_item" : {
+            "example" : 1.234,
+            "format" : "float",
+            "type" : "number"
+          },
           "integer_item" : {
             "example" : -2,
             "type" : "integer"
@@ -2550,7 +2555,7 @@
             "type" : "array"
           }
         },
-        "required" : [ "array_item", "bool_item", "integer_item", "number_item", "string_item" ],
+        "required" : [ "array_item", "bool_item", "float_item", "integer_item", "number_item", "string_item" ],
         "type" : "object"
       },
       "XmlItem" : {