WebFlux functional DSL does not recognise query parameters. Fixes #971

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractRequestService.java

@@ -420,7 +420,7 @@ public Parameter buildParams(ParameterInfo parameterInfo, Components components,
 		// By default
 		DelegatingMethodParameter delegatingMethodParameter = (DelegatingMethodParameter) methodParameter;
 		if (RequestMethod.GET.equals(requestMethod)
-				|| (parameterInfo.getParameterModel() != null && (ParameterIn.PATH.toString().equals(parameterInfo.getParameterModel().getIn())))
+				|| (parameterInfo.getParameterModel() != null && parameterInfo.getParameterModel().getIn() !=null)
 				|| delegatingMethodParameter.isParameterObject()){
 			parameterInfo.setRequired(!methodParameter.isOptional());
 			parameterInfo.setParamType(QUERY_PARAM);

springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app82/RoutingConfiguration.java

@@ -29,7 +29,7 @@ public RouterFunction<ServerResponse> monoRouterFunction(UserHandler userHandler
 				.and(route(POST("/api/user/post").and(accept(APPLICATION_JSON)), userHandler::postUser)
 						.withAttribute(OPERATION_ATTRIBUTE, operationBuilder().beanClass(UserRepository.class).beanMethod("saveUser")))
 
-				.and(route(PUT("/api/user/put/{id}").and(accept(APPLICATION_JSON)), userHandler::putUser)
+				.and(route(PUT("/api/user/put").and(accept(APPLICATION_JSON)), userHandler::putUser)
 						.withAttribute(OPERATION_ATTRIBUTE, operationBuilder().beanClass(UserRepository.class).beanMethod("putUser")))
 
 				.and(route(DELETE("/api/user/delete/{id}").and(accept(APPLICATION_JSON)), userHandler::deleteUser)

springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app82/UserRepository.java

@@ -18,7 +18,7 @@ public interface UserRepository {
 
     public Mono<Void> saveUser(Mono<User> user);
 
-    public Mono<User> putUser(@Parameter(in = ParameterIn.PATH) Long id, Mono<User> user);
+    public Mono<User> putUser(@Parameter(in = ParameterIn.QUERY) Long id, Mono<User> user);
 
     public Mono<String> deleteUser(@Parameter(in = ParameterIn.PATH) Long id);
 }

springdoc-openapi-webflux-core/src/test/resources/results/app82.json

@@ -11,55 +11,54 @@
     }
   ],
   "paths": {
-    "/api/user/index": {
-      "get": {
+    "/api/user/delete/{id}": {
+      "delete": {
         "tags": [
           "user-repository-impl"
         ],
-        "description": "get all the users",
-        "operationId": "getAllUsers",
+        "operationId": "deleteUser",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/User"
-                  }
+                  "type": "string"
                 }
               }
             }
           }
         }
       }
     },
-    "/api/user/{id}": {
+    "/api/user/index": {
       "get": {
         "tags": [
           "user-repository-impl"
         ],
-        "operationId": "getUserById",
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "description": "The user Id",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int64"
-            }
-          }
-        ],
+        "description": "get all the users",
+        "operationId": "getAllUsers",
         "responses": {
           "200": {
             "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/User"
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/User"
+                  }
                 }
               }
             }
@@ -89,7 +88,7 @@
         }
       }
     },
-    "/api/user/put/{id}": {
+    "/api/user/put": {
       "put": {
         "tags": [
           "user-repository-impl"
@@ -98,7 +97,7 @@
         "parameters": [
           {
             "name": "id",
-            "in": "path",
+            "in": "query",
             "required": true,
             "schema": {
               "type": "integer",
@@ -129,16 +128,17 @@
         }
       }
     },
-    "/api/user/delete/{id}": {
-      "delete": {
+    "/api/user/{id}": {
+      "get": {
         "tags": [
           "user-repository-impl"
         ],
-        "operationId": "deleteUser",
+        "operationId": "getUserById",
         "parameters": [
           {
             "name": "id",
             "in": "path",
+            "description": "The user Id",
             "required": true,
             "schema": {
               "type": "integer",
@@ -152,7 +152,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "string"
+                  "$ref": "#/components/schemas/User"
                 }
               }
             }