[Java][Spring] fix Spring RequestMapping (#9900)

modules/openapi-generator/src/main/resources/JavaSpring/api.mustache

@@ -120,7 +120,8 @@ public interface {{classname}} {
     {{/headerParams}}
     })
     {{/implicitHeaders}}
-    @{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}}Mapping(
+    @RequestMapping(
+        method = RequestMethod.{{httpMethod}},
         value = "{{{path}}}"{{#singleContentTypes}}{{#hasProduces}},
         produces = "{{{vendorExtensions.x-accepts}}}"{{/hasProduces}}{{#hasConsumes}},
         consumes = "{{{vendorExtensions.x-contentType}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}},

modules/openapi-generator/src/main/resources/java-pkmst/api.mustache

@@ -55,7 +55,8 @@ public interface {{classname}} {
     {{#headerParams}}{{>implicitHeader}}{{/headerParams}}
     })
     {{/implicitHeaders}}
-    @{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}}Mapping(
+    @RequestMapping(
+        method = RequestMethod.{{httpMethod}},
         value = "{{{path}}}"{{#singleContentTypes}},
         produces = "{{{vendorExtensions.x-accepts}}}",
         consumes = "{{{vendorExtensions.x-contentType}}}"{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}},

modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache

@@ -63,7 +63,8 @@ class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) v
         authorizations = [{{#authMethods}}Authorization(value = "{{name}}"{{#isOAuth}}, scopes = [{{#scopes}}AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}}, {{/-last}}{{/scopes}}]{{/isOAuth}}){{^-last}}, {{/-last}}{{/authMethods}}]{{/hasAuthMethods}})
     @ApiResponses(
         value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{baseType}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swaggerAnnotations}}
-    @{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}}Mapping(
+    @RequestMapping(
+        method = [RequestMethod.{{httpMethod}}],
         value = ["{{#lambda.escapeDoubleQuote}}{{path}}{{/lambda.escapeDoubleQuote}}"]{{#singleContentTypes}}{{#hasProduces}},
         produces = "{{{vendorExtensions.x-accepts}}}"{{/hasProduces}}{{#hasConsumes}},
         consumes = "{{{vendorExtensions.x-contentType}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}},

modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache

@@ -71,7 +71,8 @@ interface {{classname}} {
         authorizations = [{{#authMethods}}Authorization(value = "{{name}}"{{#isOAuth}}, scopes = [{{#scopes}}AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}}, {{/-last}}{{/scopes}}]{{/isOAuth}}){{^-last}}, {{/-last}}{{/authMethods}}]{{/hasAuthMethods}})
     @ApiResponses(
         value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{baseType}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swaggerAnnotations}}
-    @{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}}Mapping(
+    @RequestMapping(
+            method = [RequestMethod.{{httpMethod}}],
             value = ["{{#lambda.escapeDoubleQuote}}{{path}}{{/lambda.escapeDoubleQuote}}"]{{#singleContentTypes}}{{#hasProduces}},
             produces = "{{{vendorExtensions.x-accepts}}}"{{/hasProduces}}{{#hasConsumes}},
             consumes = "{{{vendorExtensions.x-contentType}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}},

modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml

@@ -481,6 +481,15 @@ paths:
       responses:
         default:
           description: successful operation
+    options:
+      tags:
+        - user
+      summary: logoutUserOptions
+      description: ''
+      operationId: logoutUserOptions
+      responses:
+        default:
+          description: endpoint configuration response
   '/user/{username}':
     get:
       tags:

samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java

@@ -41,7 +41,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = "application/json"
     )
@@ -62,7 +63,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     CompletableFuture<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey);
@@ -84,7 +86,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = "application/json"
     )
@@ -108,7 +111,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = "application/json"
     )
@@ -132,7 +136,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = "application/json"
     )
@@ -156,7 +161,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = "application/json"
     )
@@ -178,7 +184,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = "application/x-www-form-urlencoded"
     )
@@ -200,7 +207,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = "application/json",
         consumes = "multipart/form-data"

samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java

@@ -40,7 +40,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{orderId}"
     )
     CompletableFuture<ResponseEntity<Void>> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("orderId") String orderId);
@@ -58,7 +59,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = "application/json"
     )
@@ -79,7 +81,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{orderId}",
         produces = "application/json"
     )
@@ -97,7 +100,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = "application/json"
     )

samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java

@@ -38,7 +38,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     CompletableFuture<ResponseEntity<Void>> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body);
@@ -53,7 +54,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     CompletableFuture<ResponseEntity<Void>> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body);
@@ -68,7 +70,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     CompletableFuture<ResponseEntity<Void>> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body);
@@ -86,7 +89,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     CompletableFuture<ResponseEntity<Void>> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username);
@@ -105,7 +109,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = "application/json"
     )
@@ -124,7 +129,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = "application/json"
     )
@@ -139,7 +145,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     CompletableFuture<ResponseEntity<Void>> logoutUser();
@@ -158,7 +165,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     CompletableFuture<ResponseEntity<Void>> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body);

samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java

@@ -40,7 +40,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = "application/json"
     )
@@ -61,7 +62,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey);
@@ -83,7 +85,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = "application/json"
     )
@@ -107,7 +110,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = "application/json"
     )
@@ -131,7 +135,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = "application/json"
     )
@@ -155,7 +160,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = "application/json"
     )
@@ -177,7 +183,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = "application/x-www-form-urlencoded"
     )
@@ -199,7 +206,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = "application/json",
         consumes = "multipart/form-data"

samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java

@@ -39,7 +39,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{orderId}"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("orderId") String orderId);
@@ -57,7 +58,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = "application/json"
     )
@@ -78,7 +80,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{orderId}",
         produces = "application/json"
     )
@@ -96,7 +99,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = "application/json"
     )

samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java

@@ -37,7 +37,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body);
@@ -52,7 +53,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body);
@@ -67,7 +69,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body);
@@ -85,7 +88,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username);
@@ -104,7 +108,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = "application/json"
     )
@@ -123,7 +128,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = "application/json"
     )
@@ -138,7 +144,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> logoutUser();
@@ -157,7 +164,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body);

samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java

@@ -40,7 +40,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = "application/json"
     )
@@ -61,7 +62,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey);
@@ -83,7 +85,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = "application/json"
     )
@@ -107,7 +110,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = "application/json"
     )
@@ -131,7 +135,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = "application/json"
     )
@@ -155,7 +160,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = "application/json"
     )
@@ -177,7 +183,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = "application/x-www-form-urlencoded"
     )
@@ -199,7 +206,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = "application/json",
         consumes = "multipart/form-data"

samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java

@@ -39,7 +39,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{orderId}"
     )
     ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("orderId") String orderId);
@@ -57,7 +58,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = "application/json"
     )
@@ -78,7 +80,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{orderId}",
         produces = "application/json"
     )
@@ -96,7 +99,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = "application/json"
     )

samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java

@@ -37,7 +37,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body);
@@ -52,7 +53,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body);
@@ -67,7 +69,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body);
@@ -85,7 +88,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username);
@@ -104,7 +108,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = "application/json"
     )
@@ -123,7 +128,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = "application/json"
     )
@@ -138,12 +144,28 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     ResponseEntity<Void> logoutUser();
 
 
+    /**
+     * OPTIONS /user/logout : logoutUserOptions
+     *
+     * @return endpoint configuration response (status code 200)
+     */
+    @ApiOperation(value = "logoutUserOptions", nickname = "logoutUserOptions", notes = "", tags={ "user", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "endpoint configuration response") })
+    @RequestMapping(
+        method = RequestMethod.OPTIONS,
+        value = "/user/logout"
+    )
+    ResponseEntity<Void> logoutUserOptions();
+
+
     /**
      * PUT /user/{username} : Updated user
      * This can only be done by the logged in user.
@@ -157,7 +179,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body);

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java

@@ -40,7 +40,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = "application/json"
     )
@@ -61,7 +62,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey);
@@ -83,7 +85,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = "application/json"
     )
@@ -107,7 +110,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = "application/json"
     )
@@ -131,7 +135,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = "application/json"
     )
@@ -155,7 +160,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = "application/json"
     )
@@ -177,7 +183,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = "application/x-www-form-urlencoded"
     )
@@ -199,7 +206,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = "application/json",
         consumes = "multipart/form-data"

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java

@@ -39,7 +39,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{orderId}"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("orderId") String orderId);
@@ -57,7 +58,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = "application/json"
     )
@@ -78,7 +80,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{orderId}",
         produces = "application/json"
     )
@@ -96,7 +99,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = "application/json"
     )

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java

@@ -37,7 +37,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body);
@@ -52,7 +53,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body);
@@ -67,7 +69,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body);
@@ -85,7 +88,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username);
@@ -104,7 +108,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = "application/json"
     )
@@ -123,7 +128,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = "application/json"
     )
@@ -138,7 +144,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> logoutUser();
@@ -157,7 +164,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body);

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java

@@ -44,7 +44,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = "application/json"
     )
@@ -68,7 +69,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     default ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) {
@@ -93,7 +95,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = "application/json"
     )
@@ -134,7 +137,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = "application/json"
     )
@@ -175,7 +179,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = "application/json"
     )
@@ -216,7 +221,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = "application/json"
     )
@@ -241,7 +247,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = "application/x-www-form-urlencoded"
     )
@@ -266,7 +273,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = "application/json",
         consumes = "multipart/form-data"

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java

@@ -43,7 +43,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{orderId}"
     )
     default ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("orderId") String orderId) {
@@ -64,7 +65,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = "application/json"
     )
@@ -88,7 +90,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{orderId}",
         produces = "application/json"
     )
@@ -123,7 +126,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = "application/json"
     )

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java

@@ -41,7 +41,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     default ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body) {
@@ -59,7 +60,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     default ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -77,7 +79,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     default ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -98,7 +101,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) {
@@ -120,7 +124,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = "application/json"
     )
@@ -156,7 +161,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = "application/json"
     )
@@ -174,7 +180,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     default ResponseEntity<Void> logoutUser() {
@@ -196,7 +203,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body) {

samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt

@@ -50,7 +50,8 @@ interface PetApi {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 405, message = "Invalid input")])
-    @PostMapping(
+    @RequestMapping(
+            method = [RequestMethod.POST],
             value = ["/pet"],
             produces = ["application/xml", "application/json"],
             consumes = ["application/json", "application/xml"]
@@ -67,7 +68,8 @@ interface PetApi {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid pet value")])
-    @DeleteMapping(
+    @RequestMapping(
+            method = [RequestMethod.DELETE],
             value = ["/pet/{petId}"]
     )
     fun deletePet(@ApiParam(value = "Pet id to delete", required=true) @PathVariable("petId") petId: kotlin.Long
@@ -85,7 +87,8 @@ interface PetApi {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid status value")])
-    @GetMapping(
+    @RequestMapping(
+            method = [RequestMethod.GET],
             value = ["/pet/findByStatus"],
             produces = ["application/xml", "application/json"]
     )
@@ -103,7 +106,8 @@ interface PetApi {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid tag value")])
-    @GetMapping(
+    @RequestMapping(
+            method = [RequestMethod.GET],
             value = ["/pet/findByTags"],
             produces = ["application/xml", "application/json"]
     )
@@ -120,7 +124,8 @@ interface PetApi {
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found")])
-    @GetMapping(
+    @RequestMapping(
+            method = [RequestMethod.GET],
             value = ["/pet/{petId}"],
             produces = ["application/xml", "application/json"]
     )
@@ -137,7 +142,8 @@ interface PetApi {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")])
-    @PutMapping(
+    @RequestMapping(
+            method = [RequestMethod.PUT],
             value = ["/pet"],
             produces = ["application/xml", "application/json"],
             consumes = ["application/json", "application/xml"]
@@ -154,7 +160,8 @@ interface PetApi {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 405, message = "Invalid input")])
-    @PostMapping(
+    @RequestMapping(
+            method = [RequestMethod.POST],
             value = ["/pet/{petId}"],
             consumes = ["application/x-www-form-urlencoded"]
     )
@@ -173,7 +180,8 @@ interface PetApi {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)])
-    @PostMapping(
+    @RequestMapping(
+            method = [RequestMethod.POST],
             value = ["/pet/{petId}/uploadImage"],
             produces = ["application/json"],
             consumes = ["multipart/form-data"]

samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt

@@ -47,7 +47,8 @@ interface StoreApi {
         notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors")
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
-    @DeleteMapping(
+    @RequestMapping(
+            method = [RequestMethod.DELETE],
             value = ["/store/order/{orderId}"]
     )
     fun deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required=true) @PathVariable("orderId") orderId: kotlin.String
@@ -64,7 +65,8 @@ interface StoreApi {
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")])
-    @GetMapping(
+    @RequestMapping(
+            method = [RequestMethod.GET],
             value = ["/store/inventory"],
             produces = ["application/json"]
     )
@@ -79,7 +81,8 @@ interface StoreApi {
         response = Order::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
-    @GetMapping(
+    @RequestMapping(
+            method = [RequestMethod.GET],
             value = ["/store/order/{orderId}"],
             produces = ["application/xml", "application/json"]
     )
@@ -95,7 +98,8 @@ interface StoreApi {
         response = Order::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid Order")])
-    @PostMapping(
+    @RequestMapping(
+            method = [RequestMethod.POST],
             value = ["/store/order"],
             produces = ["application/xml", "application/json"],
             consumes = ["application/json"]

samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt

@@ -48,7 +48,8 @@ interface UserApi {
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @PostMapping(
+    @RequestMapping(
+            method = [RequestMethod.POST],
             value = ["/user"],
             consumes = ["application/json"]
     )
@@ -64,7 +65,8 @@ interface UserApi {
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @PostMapping(
+    @RequestMapping(
+            method = [RequestMethod.POST],
             value = ["/user/createWithArray"],
             consumes = ["application/json"]
     )
@@ -80,7 +82,8 @@ interface UserApi {
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @PostMapping(
+    @RequestMapping(
+            method = [RequestMethod.POST],
             value = ["/user/createWithList"],
             consumes = ["application/json"]
     )
@@ -96,7 +99,8 @@ interface UserApi {
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")])
-    @DeleteMapping(
+    @RequestMapping(
+            method = [RequestMethod.DELETE],
             value = ["/user/{username}"]
     )
     fun deleteUser(@ApiParam(value = "The name that needs to be deleted", required=true) @PathVariable("username") username: kotlin.String
@@ -111,7 +115,8 @@ interface UserApi {
         response = User::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = User::class),ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")])
-    @GetMapping(
+    @RequestMapping(
+            method = [RequestMethod.GET],
             value = ["/user/{username}"],
             produces = ["application/xml", "application/json"]
     )
@@ -127,7 +132,8 @@ interface UserApi {
         response = kotlin.String::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class),ApiResponse(code = 400, message = "Invalid username/password supplied")])
-    @GetMapping(
+    @RequestMapping(
+            method = [RequestMethod.GET],
             value = ["/user/login"],
             produces = ["application/xml", "application/json"]
     )
@@ -144,7 +150,8 @@ interface UserApi {
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @GetMapping(
+    @RequestMapping(
+            method = [RequestMethod.GET],
             value = ["/user/logout"]
     )
     fun logoutUser(): ResponseEntity<Unit> {
@@ -158,7 +165,8 @@ interface UserApi {
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid user supplied"),ApiResponse(code = 404, message = "User not found")])
-    @PutMapping(
+    @RequestMapping(
+            method = [RequestMethod.PUT],
             value = ["/user/{username}"],
             consumes = ["application/json"]
     )

samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt

@@ -44,7 +44,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 405, message = "Invalid input")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/pet"],
         consumes = ["application/json", "application/xml"]
     )
@@ -60,7 +61,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid pet value")])
-    @DeleteMapping(
+    @RequestMapping(
+        method = [RequestMethod.DELETE],
         value = ["/pet/{petId}"]
     )
     suspend fun deletePet(@ApiParam(value = "Pet id to delete", required=true) @PathVariable("petId") petId: kotlin.Long
@@ -78,7 +80,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid status value")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/pet/findByStatus"],
         produces = ["application/xml", "application/json"]
     )
@@ -96,7 +99,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid tag value")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/pet/findByTags"],
         produces = ["application/xml", "application/json"]
     )
@@ -113,7 +117,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/pet/{petId}"],
         produces = ["application/xml", "application/json"]
     )
@@ -129,7 +134,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")])
-    @PutMapping(
+    @RequestMapping(
+        method = [RequestMethod.PUT],
         value = ["/pet"],
         consumes = ["application/json", "application/xml"]
     )
@@ -145,7 +151,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 405, message = "Invalid input")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/pet/{petId}"],
         consumes = ["application/x-www-form-urlencoded"]
     )
@@ -164,7 +171,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/pet/{petId}/uploadImage"],
         produces = ["application/json"],
         consumes = ["multipart/form-data"]

samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt

@@ -42,7 +42,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
         notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors")
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
-    @DeleteMapping(
+    @RequestMapping(
+        method = [RequestMethod.DELETE],
         value = ["/store/order/{orderId}"]
     )
     suspend fun deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required=true) @PathVariable("orderId") orderId: kotlin.String
@@ -59,7 +60,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/store/inventory"],
         produces = ["application/json"]
     )
@@ -74,7 +76,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
         response = Order::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/store/order/{orderId}"],
         produces = ["application/xml", "application/json"]
     )
@@ -90,7 +93,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
         response = Order::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid Order")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/store/order"],
         produces = ["application/xml", "application/json"]
     )

samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt

@@ -42,7 +42,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "This can only be done by the logged in user.")
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/user"]
     )
     suspend fun createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody body: User
@@ -56,7 +57,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "")
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/user/createWithArray"]
     )
     suspend fun createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody body: Flow<User>
@@ -70,7 +72,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "")
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/user/createWithList"]
     )
     suspend fun createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody body: Flow<User>
@@ -84,7 +87,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "This can only be done by the logged in user.")
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")])
-    @DeleteMapping(
+    @RequestMapping(
+        method = [RequestMethod.DELETE],
         value = ["/user/{username}"]
     )
     suspend fun deleteUser(@ApiParam(value = "The name that needs to be deleted", required=true) @PathVariable("username") username: kotlin.String
@@ -99,7 +103,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         response = User::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = User::class),ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/user/{username}"],
         produces = ["application/xml", "application/json"]
     )
@@ -115,7 +120,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         response = kotlin.String::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class),ApiResponse(code = 400, message = "Invalid username/password supplied")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/user/login"],
         produces = ["application/xml", "application/json"]
     )
@@ -131,7 +137,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "")
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/user/logout"]
     )
     suspend fun logoutUser(): ResponseEntity<Unit> {
@@ -144,7 +151,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "This can only be done by the logged in user.")
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid user supplied"),ApiResponse(code = 404, message = "User not found")])
-    @PutMapping(
+    @RequestMapping(
+        method = [RequestMethod.PUT],
         value = ["/user/{username}"]
     )
     suspend fun updateUser(@ApiParam(value = "name that need to be deleted", required=true) @PathVariable("username") username: kotlin.String

samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt

@@ -43,7 +43,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 405, message = "Invalid input")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/pet"],
         consumes = ["application/json", "application/xml"]
     )
@@ -59,7 +60,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid pet value")])
-    @DeleteMapping(
+    @RequestMapping(
+        method = [RequestMethod.DELETE],
         value = ["/pet/{petId}"]
     )
     fun deletePet(@ApiParam(value = "Pet id to delete", required=true) @PathVariable("petId") petId: kotlin.Long
@@ -77,7 +79,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid status value")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/pet/findByStatus"],
         produces = ["application/xml", "application/json"]
     )
@@ -95,7 +98,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid tag value")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/pet/findByTags"],
         produces = ["application/xml", "application/json"]
     )
@@ -112,7 +116,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/pet/{petId}"],
         produces = ["application/xml", "application/json"]
     )
@@ -128,7 +133,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")])
-    @PutMapping(
+    @RequestMapping(
+        method = [RequestMethod.PUT],
         value = ["/pet"],
         consumes = ["application/json", "application/xml"]
     )
@@ -144,7 +150,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 405, message = "Invalid input")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/pet/{petId}"],
         consumes = ["application/x-www-form-urlencoded"]
     )
@@ -163,7 +170,8 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/pet/{petId}/uploadImage"],
         produces = ["application/json"],
         consumes = ["multipart/form-data"]

samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt

@@ -41,7 +41,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
         notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors")
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
-    @DeleteMapping(
+    @RequestMapping(
+        method = [RequestMethod.DELETE],
         value = ["/store/order/{orderId}"]
     )
     fun deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required=true) @PathVariable("orderId") orderId: kotlin.String
@@ -58,7 +59,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
         authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/store/inventory"],
         produces = ["application/json"]
     )
@@ -73,7 +75,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
         response = Order::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/store/order/{orderId}"],
         produces = ["application/xml", "application/json"]
     )
@@ -89,7 +92,8 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
         response = Order::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid Order")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/store/order"],
         produces = ["application/xml", "application/json"]
     )

samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt

@@ -41,7 +41,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "This can only be done by the logged in user.")
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/user"]
     )
     fun createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody body: User
@@ -55,7 +56,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "")
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/user/createWithArray"]
     )
     fun createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody body: kotlin.collections.List<User>
@@ -69,7 +71,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "")
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @PostMapping(
+    @RequestMapping(
+        method = [RequestMethod.POST],
         value = ["/user/createWithList"]
     )
     fun createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody body: kotlin.collections.List<User>
@@ -83,7 +86,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "This can only be done by the logged in user.")
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")])
-    @DeleteMapping(
+    @RequestMapping(
+        method = [RequestMethod.DELETE],
         value = ["/user/{username}"]
     )
     fun deleteUser(@ApiParam(value = "The name that needs to be deleted", required=true) @PathVariable("username") username: kotlin.String
@@ -98,7 +102,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         response = User::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = User::class),ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/user/{username}"],
         produces = ["application/xml", "application/json"]
     )
@@ -114,7 +119,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         response = kotlin.String::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class),ApiResponse(code = 400, message = "Invalid username/password supplied")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/user/login"],
         produces = ["application/xml", "application/json"]
     )
@@ -130,7 +136,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "")
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
-    @GetMapping(
+    @RequestMapping(
+        method = [RequestMethod.GET],
         value = ["/user/logout"]
     )
     fun logoutUser(): ResponseEntity<Unit> {
@@ -143,7 +150,8 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         notes = "This can only be done by the logged in user.")
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid user supplied"),ApiResponse(code = 404, message = "User not found")])
-    @PutMapping(
+    @RequestMapping(
+        method = [RequestMethod.PUT],
         value = ["/user/{username}"]
     )
     fun updateUser(@ApiParam(value = "name that need to be deleted", required=true) @PathVariable("username") username: kotlin.String

samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java

@@ -46,7 +46,8 @@ public interface TestHeadersApi {
     @ApiOperation(value = "test headers", nickname = "headersTest", notes = "desc", response = TestResponse.class, tags={ "verify-default-value", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "default response", response = TestResponse.class) })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/test-headers",
         produces = { "application/json" }
     )

samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java

@@ -46,7 +46,8 @@ public interface TestQueryParamsApi {
     @ApiOperation(value = "test query params", nickname = "queryParamsTest", notes = "desc", response = TestResponse.class, tags={ "verify-default-value", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "default response", response = TestResponse.class) })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/test-query-params",
         produces = { "application/json" }
     )

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

@@ -41,7 +41,8 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

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

@@ -50,7 +50,8 @@ public interface FakeApi {
     @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -70,7 +71,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -90,7 +92,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -121,7 +124,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -141,7 +145,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -161,7 +166,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -181,7 +187,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -201,7 +208,8 @@ public interface FakeApi {
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -251,7 +259,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -280,7 +289,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -305,7 +315,8 @@ 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") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     default CompletableFuture<ResponseEntity<Void>> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@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) {
@@ -323,7 +334,8 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -343,7 +355,8 @@ public interface FakeApi {
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -367,7 +380,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     default CompletableFuture<ResponseEntity<Void>> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context) {
@@ -391,7 +405,8 @@ public interface FakeApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

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

@@ -44,7 +44,8 @@ public interface FakeClassnameTestApi {
          }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }

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

@@ -48,7 +48,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -74,7 +75,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     default CompletableFuture<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) {
@@ -99,7 +101,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }
     )
@@ -142,7 +145,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }
     )
@@ -185,7 +189,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }
     )
@@ -230,7 +235,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -255,7 +261,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -280,7 +287,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

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

@@ -44,7 +44,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{order_id}"
     )
     default CompletableFuture<ResponseEntity<Void>> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) {
@@ -65,7 +66,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = { "application/json" }
     )
@@ -89,7 +91,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }
     )
@@ -126,7 +129,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = { "application/xml", "application/json" }
     )

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

@@ -42,7 +42,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     default CompletableFuture<ResponseEntity<Void>> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body) {
@@ -60,7 +61,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     default CompletableFuture<ResponseEntity<Void>> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -78,7 +80,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     default CompletableFuture<ResponseEntity<Void>> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -99,7 +102,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     default CompletableFuture<ResponseEntity<Void>> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) {
@@ -121,7 +125,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = { "application/xml", "application/json" }
     )
@@ -159,7 +164,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = { "application/xml", "application/json" }
     )
@@ -177,7 +183,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     default CompletableFuture<ResponseEntity<Void>> logoutUser() {
@@ -199,7 +206,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     default CompletableFuture<ResponseEntity<Void>> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body) {

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -40,7 +40,8 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

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

@@ -49,7 +49,8 @@ public interface FakeApi {
     @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -69,7 +70,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -89,7 +91,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -118,7 +121,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -138,7 +142,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -158,7 +163,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -178,7 +184,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -198,7 +205,8 @@ public interface FakeApi {
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -246,7 +254,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -275,7 +284,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -300,7 +310,8 @@ 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") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     default ResponseEntity<Void> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@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) {
@@ -318,7 +329,8 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -338,7 +350,8 @@ public interface FakeApi {
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -362,7 +375,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     default ResponseEntity<Void> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context) {
@@ -386,7 +400,8 @@ public interface FakeApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -43,7 +43,8 @@ public interface FakeClassnameTestApi {
          }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java

@@ -47,7 +47,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -73,7 +74,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     default ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) {
@@ -98,7 +100,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }
     )
@@ -139,7 +142,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }
     )
@@ -180,7 +184,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }
     )
@@ -223,7 +228,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -248,7 +254,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -273,7 +280,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java

@@ -43,7 +43,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{order_id}"
     )
     default ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) {
@@ -64,7 +65,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = { "application/json" }
     )
@@ -88,7 +90,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }
     )
@@ -123,7 +126,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = { "application/xml", "application/json" }
     )

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java

@@ -41,7 +41,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     default ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body) {
@@ -59,7 +60,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     default ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -77,7 +79,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     default ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -98,7 +101,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) {
@@ -120,7 +124,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = { "application/xml", "application/json" }
     )
@@ -156,7 +161,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = { "application/xml", "application/json" }
     )
@@ -174,7 +180,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     default ResponseEntity<Void> logoutUser() {
@@ -196,7 +203,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body) {

samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -40,7 +40,8 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java

@@ -49,7 +49,8 @@ public interface FakeApi {
     @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -69,7 +70,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -89,7 +91,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -118,7 +121,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -138,7 +142,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -158,7 +163,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -178,7 +184,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -198,7 +205,8 @@ public interface FakeApi {
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -246,7 +254,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -275,7 +284,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -300,7 +310,8 @@ 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") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     default ResponseEntity<Void> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@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) {
@@ -318,7 +329,8 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -338,7 +350,8 @@ public interface FakeApi {
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -362,7 +375,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     default ResponseEntity<Void> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context) {
@@ -386,7 +400,8 @@ public interface FakeApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -43,7 +43,8 @@ public interface FakeClassnameTestApi {
          }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java

@@ -47,7 +47,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -73,7 +74,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     default ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) {
@@ -98,7 +100,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }
     )
@@ -139,7 +142,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }
     )
@@ -180,7 +184,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }
     )
@@ -223,7 +228,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -248,7 +254,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -273,7 +280,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java

@@ -43,7 +43,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{order_id}"
     )
     default ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) {
@@ -64,7 +65,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = { "application/json" }
     )
@@ -88,7 +90,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }
     )
@@ -123,7 +126,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = { "application/xml", "application/json" }
     )

samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java

@@ -41,7 +41,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     default ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body) {
@@ -59,7 +60,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     default ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -77,7 +79,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     default ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -98,7 +101,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) {
@@ -120,7 +124,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = { "application/xml", "application/json" }
     )
@@ -156,7 +161,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = { "application/xml", "application/json" }
     )
@@ -174,7 +180,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     default ResponseEntity<Void> logoutUser() {
@@ -196,7 +203,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body) {

samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -40,7 +40,8 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

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

@@ -49,7 +49,8 @@ public interface FakeApi {
     @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -69,7 +70,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -89,7 +91,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -118,7 +121,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -138,7 +142,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -158,7 +163,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -178,7 +184,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -198,7 +205,8 @@ public interface FakeApi {
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -246,7 +254,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -275,7 +284,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -300,7 +310,8 @@ 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") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     default ResponseEntity<Void> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@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) {
@@ -318,7 +329,8 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -338,7 +350,8 @@ public interface FakeApi {
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -362,7 +375,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     default ResponseEntity<Void> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context) {
@@ -386,7 +400,8 @@ public interface FakeApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -43,7 +43,8 @@ public interface FakeClassnameTestApi {
          }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java

@@ -46,7 +46,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -72,7 +73,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     default ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) {
@@ -97,7 +99,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }
     )
@@ -138,7 +141,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }
     )
@@ -179,7 +183,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }
     )
@@ -222,7 +227,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -247,7 +253,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -272,7 +279,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java

@@ -43,7 +43,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{order_id}"
     )
     default ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) {
@@ -64,7 +65,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = { "application/json" }
     )
@@ -88,7 +90,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }
     )
@@ -123,7 +126,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = { "application/xml", "application/json" }
     )

samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java

@@ -41,7 +41,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     default ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body) {
@@ -59,7 +60,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     default ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -77,7 +79,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     default ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -98,7 +101,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) {
@@ -120,7 +124,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = { "application/xml", "application/json" }
     )
@@ -156,7 +161,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = { "application/xml", "application/json" }
     )
@@ -174,7 +180,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     default ResponseEntity<Void> logoutUser() {
@@ -196,7 +203,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body) {

samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -40,7 +40,8 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

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

@@ -49,7 +49,8 @@ public interface FakeApi {
     @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -69,7 +70,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -89,7 +91,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -118,7 +121,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -138,7 +142,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -158,7 +163,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -178,7 +184,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -198,7 +205,8 @@ public interface FakeApi {
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -246,7 +254,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -275,7 +284,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -300,7 +310,8 @@ 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") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     default ResponseEntity<Void> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@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) {
@@ -318,7 +329,8 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -338,7 +350,8 @@ public interface FakeApi {
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -362,7 +375,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     default ResponseEntity<Void> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context) {
@@ -386,7 +400,8 @@ public interface FakeApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -43,7 +43,8 @@ public interface FakeClassnameTestApi {
          }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java

@@ -47,7 +47,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -73,7 +74,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     default ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) {
@@ -98,7 +100,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }
     )
@@ -139,7 +142,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }
     )
@@ -180,7 +184,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }
     )
@@ -223,7 +228,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -248,7 +254,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -273,7 +280,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java

@@ -43,7 +43,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{order_id}"
     )
     default ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) {
@@ -64,7 +65,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = { "application/json" }
     )
@@ -88,7 +90,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }
     )
@@ -123,7 +126,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = { "application/xml", "application/json" }
     )

samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java

@@ -41,7 +41,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     default ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body) {
@@ -59,7 +60,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     default ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -77,7 +79,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     default ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -98,7 +101,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) {
@@ -120,7 +124,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = { "application/xml", "application/json" }
     )
@@ -156,7 +161,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = { "application/xml", "application/json" }
     )
@@ -174,7 +180,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     default ResponseEntity<Void> logoutUser() {
@@ -196,7 +203,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body) {

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -32,7 +32,8 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java

@@ -41,7 +41,8 @@ public interface FakeApi {
     @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -58,7 +59,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -75,7 +77,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -92,7 +95,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -109,7 +113,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -126,7 +131,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -143,7 +149,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -160,7 +167,8 @@ public interface FakeApi {
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -196,7 +204,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -222,7 +231,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -244,7 +254,8 @@ 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") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     ResponseEntity<Void> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@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);
@@ -259,7 +270,8 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -276,7 +288,8 @@ public interface FakeApi {
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -297,7 +310,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     ResponseEntity<Void> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context);
@@ -318,7 +332,8 @@ public interface FakeApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -35,7 +35,8 @@ public interface FakeClassnameTestApi {
          }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java

@@ -39,7 +39,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -62,7 +63,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey);
@@ -84,7 +86,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }
     )
@@ -108,7 +111,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }
     )
@@ -132,7 +136,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }
     )
@@ -158,7 +163,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -180,7 +186,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -202,7 +209,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java

@@ -35,7 +35,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{order_id}"
     )
     ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId);
@@ -53,7 +54,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = { "application/json" }
     )
@@ -74,7 +76,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }
     )
@@ -92,7 +95,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = { "application/xml", "application/json" }
     )

samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java

@@ -33,7 +33,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body);
@@ -48,7 +49,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body);
@@ -63,7 +65,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body);
@@ -81,7 +84,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username);
@@ -100,7 +104,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = { "application/xml", "application/json" }
     )
@@ -119,7 +124,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = { "application/xml", "application/json" }
     )
@@ -134,7 +140,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     ResponseEntity<Void> logoutUser();
@@ -153,7 +160,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body);

samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -40,7 +40,8 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java

@@ -49,7 +49,8 @@ public interface FakeApi {
     @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -69,7 +70,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -89,7 +91,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -118,7 +121,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -138,7 +142,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -158,7 +163,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -178,7 +184,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -198,7 +205,8 @@ public interface FakeApi {
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -246,7 +254,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -275,7 +284,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -300,7 +310,8 @@ 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") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     default ResponseEntity<Void> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@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) {
@@ -318,7 +329,8 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -338,7 +350,8 @@ public interface FakeApi {
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -362,7 +375,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     default ResponseEntity<Void> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context) {
@@ -386,7 +400,8 @@ public interface FakeApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -43,7 +43,8 @@ public interface FakeClassnameTestApi {
          }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java

@@ -47,7 +47,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -73,7 +74,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     default ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) {
@@ -98,7 +100,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }
     )
@@ -139,7 +142,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }
     )
@@ -180,7 +184,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }
     )
@@ -223,7 +228,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -248,7 +254,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -273,7 +280,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java

@@ -43,7 +43,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{order_id}"
     )
     default ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) {
@@ -64,7 +65,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = { "application/json" }
     )
@@ -88,7 +90,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }
     )
@@ -123,7 +126,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = { "application/xml", "application/json" }
     )

samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java

@@ -41,7 +41,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     default ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body) {
@@ -59,7 +60,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     default ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -77,7 +79,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     default ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -98,7 +101,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) {
@@ -120,7 +124,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = { "application/xml", "application/json" }
     )
@@ -156,7 +161,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = { "application/xml", "application/json" }
     )
@@ -174,7 +180,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     default ResponseEntity<Void> logoutUser() {
@@ -196,7 +203,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body) {

samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -36,7 +36,8 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java

@@ -45,7 +45,8 @@ public interface FakeApi {
     @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -64,7 +65,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -83,7 +85,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -102,7 +105,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -121,7 +125,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -140,7 +145,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -159,7 +165,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -178,7 +185,8 @@ public interface FakeApi {
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -216,7 +224,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -244,7 +253,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -268,7 +278,8 @@ 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") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     default ResponseEntity<Void> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@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) {
@@ -285,7 +296,8 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -304,7 +316,8 @@ public interface FakeApi {
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -327,7 +340,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     default ResponseEntity<Void> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context) {
@@ -350,7 +364,8 @@ public interface FakeApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -39,7 +39,8 @@ public interface FakeClassnameTestApi {
          }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java

@@ -43,7 +43,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -68,7 +69,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     default ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) {
@@ -92,7 +94,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }
     )
@@ -118,7 +121,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }
     )
@@ -144,7 +148,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }
     )
@@ -172,7 +177,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -196,7 +202,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -220,7 +227,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java

@@ -39,7 +39,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{order_id}"
     )
     default ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) {
@@ -59,7 +60,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = { "application/json" }
     )
@@ -82,7 +84,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }
     )
@@ -102,7 +105,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = { "application/xml", "application/json" }
     )

samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java

@@ -37,7 +37,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     default ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body) {
@@ -54,7 +55,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     default ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -71,7 +73,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     default ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -91,7 +94,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) {
@@ -112,7 +116,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = { "application/xml", "application/json" }
     )
@@ -133,7 +138,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = { "application/xml", "application/json" }
     )
@@ -150,7 +156,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     default ResponseEntity<Void> logoutUser() {
@@ -171,7 +178,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body) {

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -36,7 +36,8 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java

@@ -45,7 +45,8 @@ public interface FakeApi {
     @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -64,7 +65,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -83,7 +85,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -102,7 +105,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -121,7 +125,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -140,7 +145,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -159,7 +165,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -178,7 +185,8 @@ public interface FakeApi {
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -216,7 +224,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -244,7 +253,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -268,7 +278,8 @@ 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") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     default ResponseEntity<Void> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@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) {
@@ -285,7 +296,8 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -304,7 +316,8 @@ public interface FakeApi {
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -327,7 +340,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     default ResponseEntity<Void> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context) {
@@ -350,7 +364,8 @@ public interface FakeApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -39,7 +39,8 @@ public interface FakeClassnameTestApi {
          }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java

@@ -43,7 +43,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -68,7 +69,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     default ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey) {
@@ -92,7 +94,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }
     )
@@ -118,7 +121,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }
     )
@@ -144,7 +148,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }
     )
@@ -172,7 +177,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -196,7 +202,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -220,7 +227,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java

@@ -39,7 +39,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{order_id}"
     )
     default ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) {
@@ -59,7 +60,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = { "application/json" }
     )
@@ -82,7 +84,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }
     )
@@ -102,7 +105,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = { "application/xml", "application/json" }
     )

samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java

@@ -37,7 +37,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     default ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body) {
@@ -54,7 +55,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     default ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -71,7 +73,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     default ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -91,7 +94,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) {
@@ -112,7 +116,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = { "application/xml", "application/json" }
     )
@@ -133,7 +138,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = { "application/xml", "application/json" }
     )
@@ -150,7 +156,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     default ResponseEntity<Void> logoutUser() {
@@ -171,7 +178,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body) {

samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -42,7 +42,8 @@ public interface AnotherFakeApi {
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
     @ApiImplicitParams({
     })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java

@@ -51,7 +51,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -73,7 +74,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -95,7 +97,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -126,7 +129,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -148,7 +152,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -170,7 +175,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "Success") })
     @ApiImplicitParams({
     })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -192,7 +198,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "Success") })
     @ApiImplicitParams({
     })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -214,7 +221,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
     @ApiImplicitParams({
     })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -264,7 +272,8 @@ public interface FakeApi {
         @ApiResponse(code = 404, message = "User not found") })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -295,7 +304,8 @@ public interface FakeApi {
     @ApiImplicitParam(name = "enumHeaderStringArray", value = "Header parameter enum test (string array)",  dataType = "List<String>", paramType = "header"),
     @ApiImplicitParam(name = "enumHeaderString", value = "Header parameter enum test (string)",  dataType = "String", paramType = "header")
     })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -322,7 +332,8 @@ public interface FakeApi {
     @ApiImplicitParam(name = "requiredBooleanGroup", value = "Required Boolean in group parameters", required=true, dataType = "Boolean", paramType = "header"),
     @ApiImplicitParam(name = "booleanGroup", value = "Boolean in group parameters",  dataType = "Boolean", paramType = "header")
     })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     default ResponseEntity<Void> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) {
@@ -342,7 +353,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -364,7 +376,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
     })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -390,7 +403,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "Success") })
     @ApiImplicitParams({
     })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     default ResponseEntity<Void> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context) {
@@ -416,7 +430,8 @@ public interface FakeApi {
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -45,7 +45,8 @@ public interface FakeClassnameTestApi {
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
     @ApiImplicitParams({
     })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java

@@ -49,7 +49,8 @@ public interface PetApi {
         @ApiResponse(code = 405, message = "Invalid input") })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -77,7 +78,8 @@ public interface PetApi {
     @ApiImplicitParams({
     @ApiImplicitParam(name = "apiKey", value = "",  dataType = "String", paramType = "header")
     })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     default ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId) {
@@ -104,7 +106,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid status value") })
     @ApiImplicitParams({
     })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }
     )
@@ -147,7 +150,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid tag value") })
     @ApiImplicitParams({
     })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }
     )
@@ -190,7 +194,8 @@ public interface PetApi {
         @ApiResponse(code = 404, message = "Pet not found") })
     @ApiImplicitParams({
     })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }
     )
@@ -235,7 +240,8 @@ public interface PetApi {
         @ApiResponse(code = 405, message = "Validation exception") })
     @ApiImplicitParams({
     })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -262,7 +268,8 @@ public interface PetApi {
         @ApiResponse(code = 405, message = "Invalid input") })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -289,7 +296,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java

@@ -45,7 +45,8 @@ public interface StoreApi {
         @ApiResponse(code = 404, message = "Order not found") })
     @ApiImplicitParams({
     })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{order_id}"
     )
     default ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId) {
@@ -68,7 +69,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
     @ApiImplicitParams({
     })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = { "application/json" }
     )
@@ -94,7 +96,8 @@ public interface StoreApi {
         @ApiResponse(code = 404, message = "Order not found") })
     @ApiImplicitParams({
     })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }
     )
@@ -131,7 +134,8 @@ public interface StoreApi {
         @ApiResponse(code = 400, message = "Invalid Order") })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = { "application/xml", "application/json" }
     )

samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java

@@ -43,7 +43,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     default ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody User body) {
@@ -63,7 +64,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     default ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -83,7 +85,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
     })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     default ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody List<User> body) {
@@ -106,7 +109,8 @@ public interface UserApi {
         @ApiResponse(code = 404, message = "User not found") })
     @ApiImplicitParams({
     })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username) {
@@ -130,7 +134,8 @@ public interface UserApi {
         @ApiResponse(code = 404, message = "User not found") })
     @ApiImplicitParams({
     })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = { "application/xml", "application/json" }
     )
@@ -168,7 +173,8 @@ public interface UserApi {
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
     @ApiImplicitParams({
     })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = { "application/xml", "application/json" }
     )
@@ -188,7 +194,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
     })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     default ResponseEntity<Void> logoutUser() {
@@ -212,7 +219,8 @@ public interface UserApi {
         @ApiResponse(code = 404, message = "User not found") })
     @ApiImplicitParams({
     })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     default ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody User body) {

samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -40,7 +40,8 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java

@@ -49,7 +49,8 @@ public interface FakeApi {
     @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -68,7 +69,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -87,7 +89,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -106,7 +109,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -125,7 +129,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -144,7 +149,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -163,7 +169,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -182,7 +189,8 @@ public interface FakeApi {
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -220,7 +228,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -248,7 +257,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -272,7 +282,8 @@ 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") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     default Mono<ResponseEntity<Void>> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@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, @ApiIgnore final ServerWebExchange exchange) {
@@ -289,7 +300,8 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -308,7 +320,8 @@ public interface FakeApi {
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -331,7 +344,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     default Mono<ResponseEntity<Void>> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context, @ApiIgnore final ServerWebExchange exchange) {
@@ -354,7 +368,8 @@ public interface FakeApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -43,7 +43,8 @@ public interface FakeClassnameTestApi {
          }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java

@@ -47,7 +47,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -72,7 +73,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/pet/{petId}"
     )
     default Mono<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey, @ApiIgnore final ServerWebExchange exchange) {
@@ -96,7 +98,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }
     )
@@ -122,7 +125,8 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }
     )
@@ -148,7 +152,8 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }
     )
@@ -176,7 +181,8 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/pet",
         consumes = { "application/json", "application/xml" }
     )
@@ -200,7 +206,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -224,7 +231,8 @@ public interface PetApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/pet/{petId}/uploadImage",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java

@@ -43,7 +43,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/store/order/{order_id}"
     )
     default Mono<ResponseEntity<Void>> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId, @ApiIgnore final ServerWebExchange exchange) {
@@ -63,7 +64,8 @@ public interface StoreApi {
          }, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/inventory",
         produces = { "application/json" }
     )
@@ -86,7 +88,8 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }
     )
@@ -106,7 +109,8 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/store/order",
         produces = { "application/xml", "application/json" }
     )

samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java

@@ -41,7 +41,8 @@ public interface UserApi {
     @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user"
     )
     default Mono<ResponseEntity<Void>> createUser(@ApiParam(value = "Created user object" ,required=true )  @Valid @RequestBody Mono<User> body, @ApiIgnore final ServerWebExchange exchange) {
@@ -58,7 +59,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithArray"
     )
     default Mono<ResponseEntity<Void>> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody Flux<User> body, @ApiIgnore final ServerWebExchange exchange) {
@@ -75,7 +77,8 @@ public interface UserApi {
     @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/user/createWithList"
     )
     default Mono<ResponseEntity<Void>> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true )  @Valid @RequestBody Flux<User> body, @ApiIgnore final ServerWebExchange exchange) {
@@ -95,7 +98,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/user/{username}"
     )
     default Mono<ResponseEntity<Void>> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange) {
@@ -116,7 +120,8 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/{username}",
         produces = { "application/xml", "application/json" }
     )
@@ -137,7 +142,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/login",
         produces = { "application/xml", "application/json" }
     )
@@ -154,7 +160,8 @@ public interface UserApi {
     @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/user/logout"
     )
     default Mono<ResponseEntity<Void>> logoutUser(@ApiIgnore final ServerWebExchange exchange) {
@@ -175,7 +182,8 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/user/{username}"
     )
     default Mono<ResponseEntity<Void>> updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathVariable("username") String username,@ApiParam(value = "Updated user object" ,required=true )  @Valid @RequestBody Mono<User> body, @ApiIgnore final ServerWebExchange exchange) {

samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -32,7 +32,8 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", nickname = "call123testSpecialTags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/another-fake/dummy",
         produces = { "application/json" },
         consumes = { "application/json" }

samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java

@@ -41,7 +41,8 @@ public interface FakeApi {
     @ApiOperation(value = "creates an XmlItem", nickname = "createXmlItem", notes = "this route creates an XmlItem", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/create_xml_item",
         consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }
     )
@@ -58,7 +59,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterBooleanSerialize", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/boolean",
         produces = { "*/*" }
     )
@@ -75,7 +77,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterCompositeSerialize", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/composite",
         produces = { "*/*" }
     )
@@ -92,7 +95,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterNumberSerialize", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/number",
         produces = { "*/*" }
     )
@@ -109,7 +113,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "fakeOuterStringSerialize", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/outer/string",
         produces = { "*/*" }
     )
@@ -126,7 +131,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithFileSchema", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-file-schema",
         consumes = { "application/json" }
     )
@@ -143,7 +149,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/body-with-query-params",
         consumes = { "application/json" }
     )
@@ -160,7 +167,8 @@ public interface FakeApi {
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake",
         produces = { "application/json" },
         consumes = { "application/json" }
@@ -196,7 +204,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -222,7 +231,8 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -244,7 +254,8 @@ 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") })
-    @DeleteMapping(
+    @RequestMapping(
+        method = RequestMethod.DELETE,
         value = "/fake"
     )
     ResponseEntity<Void> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@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);
@@ -259,7 +270,8 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/inline-additionalProperties",
         consumes = { "application/json" }
     )
@@ -276,7 +288,8 @@ public interface FakeApi {
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    @GetMapping(
+    @RequestMapping(
+        method = RequestMethod.GET,
         value = "/fake/jsonFormData",
         consumes = { "application/x-www-form-urlencoded" }
     )
@@ -297,7 +310,8 @@ public interface FakeApi {
     @ApiOperation(value = "", nickname = "testQueryParameterCollectionFormat", notes = "To test the collection format in query parameters", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    @PutMapping(
+    @RequestMapping(
+        method = RequestMethod.PUT,
         value = "/fake/test-query-paramters"
     )
     ResponseEntity<Void> testQueryParameterCollectionFormat(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List<String> ioutil,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List<String> http,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List<String> url,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List<String> context);
@@ -318,7 +332,8 @@ public interface FakeApi {
          }, tags={ "pet", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @PostMapping(
+    @RequestMapping(
+        method = RequestMethod.POST,
         value = "/fake/{petId}/uploadImageWithRequiredFile",
         produces = { "application/json" },
         consumes = { "multipart/form-data" }

samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -35,7 +35,8 @@ public interface FakeClassnameTestApi {
          }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    @PatchMapping(
+    @RequestMapping(
+        method = RequestMethod.PATCH,
         value = "/fake_classname_test",
         produces = { "application/json" },
         consumes = { "application/json" }