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

2021-07-27 09:27:47 +03:00
parent fcdc9d49f7
commit b1cc7445a0
139 changed files with 1688 additions and 832 deletions
--- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt
+++ b/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"]
--- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt
+++ b/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"]
    )
--- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt
+++ b/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