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

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java

@@ -178,6 +178,17 @@ public interface FakeApi {
     }
 
 
+    @ApiOperation(value = "Fake endpoint to test group parameters (optional)", nickname = "testGroupParameters", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 400, message = "Someting wrong") })
+    @RequestMapping(value = "/fake",
+        method = RequestMethod.DELETE)
+    default CompletableFuture<ResponseEntity<Void>> testGroupParameters(@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) {
+        return CompletableFuture.completedFuture(new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED));
+
+    }
+
+
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java

@@ -40,7 +40,7 @@ public class AdditionalPropertiesClass   {
   /**
    * Get mapProperty
    * @return mapProperty
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -68,7 +68,7 @@ public class AdditionalPropertiesClass   {
   /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java

@@ -35,7 +35,7 @@ public class Animal   {
   /**
    * Get className
    * @return className
-  **/
+  */
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
@@ -56,7 +56,7 @@ public class Animal   {
   /**
    * Get color
    * @return color
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

@@ -36,7 +36,7 @@ public class ArrayOfArrayOfNumberOnly   {
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java

@@ -36,7 +36,7 @@ public class ArrayOfNumberOnly   {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java

@@ -44,7 +44,7 @@ public class ArrayTest   {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -72,7 +72,7 @@ public class ArrayTest   {
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -101,7 +101,7 @@ public class ArrayTest   {
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java

@@ -39,7 +39,7 @@ public class Capitalization   {
   /**
    * Get smallCamel
    * @return smallCamel
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -59,7 +59,7 @@ public class Capitalization   {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -79,7 +79,7 @@ public class Capitalization   {
   /**
    * Get smallSnake
    * @return smallSnake
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -99,7 +99,7 @@ public class Capitalization   {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -119,7 +119,7 @@ public class Capitalization   {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -139,7 +139,7 @@ public class Capitalization   {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+  */
   @ApiModelProperty(value = "Name of the pet ")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java

@@ -25,7 +25,7 @@ public class Cat extends Animal  {
   /**
    * Get declawed
    * @return declawed
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java

@@ -27,7 +27,7 @@ public class Category   {
   /**
    * Get id
    * @return id
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -47,7 +47,7 @@ public class Category   {
   /**
    * Get name
    * @return name
-  **/
+  */
   @ApiModelProperty(required = true, value = "")
   @NotNull
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java

@@ -25,7 +25,7 @@ public class ClassModel   {
   /**
    * Get propertyClass
    * @return propertyClass
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java

@@ -24,7 +24,7 @@ public class Client   {
   /**
    * Get client
    * @return client
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java

@@ -25,7 +25,7 @@ public class Dog extends Animal  {
   /**
    * Get breed
    * @return breed
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java

@@ -93,7 +93,7 @@ public class EnumArrays   {
   /**
    * Get justSymbol
    * @return justSymbol
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -121,7 +121,7 @@ public class EnumArrays   {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java

@@ -166,7 +166,7 @@ public class EnumTest   {
   /**
    * Get enumString
    * @return enumString
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -186,7 +186,7 @@ public class EnumTest   {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+  */
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
@@ -207,7 +207,7 @@ public class EnumTest   {
   /**
    * Get enumInteger
    * @return enumInteger
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -227,7 +227,7 @@ public class EnumTest   {
   /**
    * Get enumNumber
    * @return enumNumber
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -247,7 +247,7 @@ public class EnumTest   {
   /**
    * Get outerEnum
    * @return outerEnum
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java

@@ -30,7 +30,7 @@ public class FileSchemaTestClass   {
   /**
    * Get file
    * @return file
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -59,7 +59,7 @@ public class FileSchemaTestClass   {
   /**
    * Get files
    * @return files
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java

@@ -67,7 +67,7 @@ public class FormatTest   {
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+  */
   @ApiModelProperty(value = "")
 
 @Min(10) @Max(100) 
@@ -89,7 +89,7 @@ public class FormatTest   {
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+  */
   @ApiModelProperty(value = "")
 
 @Min(20) @Max(200) 
@@ -109,7 +109,7 @@ public class FormatTest   {
   /**
    * Get int64
    * @return int64
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -131,7 +131,7 @@ public class FormatTest   {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+  */
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
@@ -155,7 +155,7 @@ public class FormatTest   {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+  */
   @ApiModelProperty(value = "")
 
 @DecimalMin("54.3") @DecimalMax("987.6") 
@@ -177,7 +177,7 @@ public class FormatTest   {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+  */
   @ApiModelProperty(value = "")
 
 @DecimalMin("67.8") @DecimalMax("123.4") 
@@ -197,7 +197,7 @@ public class FormatTest   {
   /**
    * Get string
    * @return string
-  **/
+  */
   @ApiModelProperty(value = "")
 
 @Pattern(regexp="/[a-z]/i") 
@@ -217,7 +217,7 @@ public class FormatTest   {
   /**
    * Get _byte
    * @return _byte
-  **/
+  */
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
@@ -238,7 +238,7 @@ public class FormatTest   {
   /**
    * Get binary
    * @return binary
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -259,7 +259,7 @@ public class FormatTest   {
   /**
    * Get date
    * @return date
-  **/
+  */
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
@@ -281,7 +281,7 @@ public class FormatTest   {
   /**
    * Get dateTime
    * @return dateTime
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -302,7 +302,7 @@ public class FormatTest   {
   /**
    * Get uuid
    * @return uuid
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -323,7 +323,7 @@ public class FormatTest   {
   /**
    * Get password
    * @return password
-  **/
+  */
   @ApiModelProperty(required = true, value = "")
   @NotNull
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java

@@ -27,7 +27,7 @@ public class HasOnlyReadOnly   {
   /**
    * Get bar
    * @return bar
-  **/
+  */
   @ApiModelProperty(readOnly = true, value = "")
 
 
@@ -47,7 +47,7 @@ public class HasOnlyReadOnly   {
   /**
    * Get foo
    * @return foo
-  **/
+  */
   @ApiModelProperty(readOnly = true, value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java

@@ -80,7 +80,7 @@ public class MapTest   {
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -109,7 +109,7 @@ public class MapTest   {
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -137,7 +137,7 @@ public class MapTest   {
   /**
    * Get directMap
    * @return directMap
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -165,7 +165,7 @@ public class MapTest   {
   /**
    * Get indirectMap
    * @return indirectMap
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   /**
    * Get uuid
    * @return uuid
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -58,7 +58,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   /**
    * Get dateTime
    * @return dateTime
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -87,7 +87,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   /**
    * Get map
    * @return map
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java

@@ -28,7 +28,7 @@ public class Model200Response   {
   /**
    * Get name
    * @return name
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -48,7 +48,7 @@ public class Model200Response   {
   /**
    * Get propertyClass
    * @return propertyClass
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -30,7 +30,7 @@ public class ModelApiResponse   {
   /**
    * Get code
    * @return code
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -50,7 +50,7 @@ public class ModelApiResponse   {
   /**
    * Get type
    * @return type
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -70,7 +70,7 @@ public class ModelApiResponse   {
   /**
    * Get message
    * @return message
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java

@@ -25,7 +25,7 @@ public class ModelReturn   {
   /**
    * Get _return
    * @return _return
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java

@@ -34,7 +34,7 @@ public class Name   {
   /**
    * Get name
    * @return name
-  **/
+  */
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
@@ -55,7 +55,7 @@ public class Name   {
   /**
    * Get snakeCase
    * @return snakeCase
-  **/
+  */
   @ApiModelProperty(readOnly = true, value = "")
 
 
@@ -75,7 +75,7 @@ public class Name   {
   /**
    * Get property
    * @return property
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -95,7 +95,7 @@ public class Name   {
   /**
    * Get _123number
    * @return _123number
-  **/
+  */
   @ApiModelProperty(readOnly = true, value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java

@@ -25,7 +25,7 @@ public class NumberOnly   {
   /**
    * Get justNumber
    * @return justNumber
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java

@@ -74,7 +74,7 @@ public class Order   {
   /**
    * Get id
    * @return id
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -94,7 +94,7 @@ public class Order   {
   /**
    * Get petId
    * @return petId
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -114,7 +114,7 @@ public class Order   {
   /**
    * Get quantity
    * @return quantity
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -134,7 +134,7 @@ public class Order   {
   /**
    * Get shipDate
    * @return shipDate
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -155,7 +155,7 @@ public class Order   {
   /**
    * Order Status
    * @return status
-  **/
+  */
   @ApiModelProperty(value = "Order Status")
 
 
@@ -175,7 +175,7 @@ public class Order   {
   /**
    * Get complete
    * @return complete
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java

@@ -31,7 +31,7 @@ public class OuterComposite   {
   /**
    * Get myNumber
    * @return myNumber
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -52,7 +52,7 @@ public class OuterComposite   {
   /**
    * Get myString
    * @return myString
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -72,7 +72,7 @@ public class OuterComposite   {
   /**
    * Get myBoolean
    * @return myBoolean
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java

@@ -79,7 +79,7 @@ public class Pet   {
   /**
    * Get id
    * @return id
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -99,7 +99,7 @@ public class Pet   {
   /**
    * Get category
    * @return category
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -120,7 +120,7 @@ public class Pet   {
   /**
    * Get name
    * @return name
-  **/
+  */
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @NotNull
 
@@ -146,7 +146,7 @@ public class Pet   {
   /**
    * Get photoUrls
    * @return photoUrls
-  **/
+  */
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
@@ -175,7 +175,7 @@ public class Pet   {
   /**
    * Get tags
    * @return tags
-  **/
+  */
   @ApiModelProperty(value = "")
 
   @Valid
@@ -196,7 +196,7 @@ public class Pet   {
   /**
    * pet status in the store
    * @return status
-  **/
+  */
   @ApiModelProperty(value = "pet status in the store")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java

@@ -27,7 +27,7 @@ public class ReadOnlyFirst   {
   /**
    * Get bar
    * @return bar
-  **/
+  */
   @ApiModelProperty(readOnly = true, value = "")
 
 
@@ -47,7 +47,7 @@ public class ReadOnlyFirst   {
   /**
    * Get baz
    * @return baz
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java

@@ -24,7 +24,7 @@ public class SpecialModelName   {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java

@@ -27,7 +27,7 @@ public class Tag   {
   /**
    * Get id
    * @return id
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -47,7 +47,7 @@ public class Tag   {
   /**
    * Get name
    * @return name
-  **/
+  */
   @ApiModelProperty(value = "")
 
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java

@@ -45,7 +45,7 @@ public class User   {
   /**
    * Get id
    * @return id
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -65,7 +65,7 @@ public class User   {
   /**
    * Get username
    * @return username
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -85,7 +85,7 @@ public class User   {
   /**
    * Get firstName
    * @return firstName
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -105,7 +105,7 @@ public class User   {
   /**
    * Get lastName
    * @return lastName
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -125,7 +125,7 @@ public class User   {
   /**
    * Get email
    * @return email
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -145,7 +145,7 @@ public class User   {
   /**
    * Get password
    * @return password
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -165,7 +165,7 @@ public class User   {
   /**
    * Get phone
    * @return phone
-  **/
+  */
   @ApiModelProperty(value = "")
 
 
@@ -185,7 +185,7 @@ public class User   {
   /**
    * User Status
    * @return userStatus
-  **/
+  */
   @ApiModelProperty(value = "User Status")