RouterFunction ignored when last predicate is not a PathPatternPredicate (detected with Webflux). Fixes #1695

Author: bnasslahsen

springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/fn/SpringdocRouteBuilder.java

@@ -105,7 +105,7 @@ public SpringdocRouteBuilder GET(String pattern, HandlerFunction<ServerResponse>
 	 */
 	public SpringdocRouteBuilder GET(HandlerFunction<ServerResponse> handlerFunction, Consumer<Builder> operationsConsumer) {
 		Builder builder = getOperationBuilder(operationsConsumer);
-		this.delegate.GET(handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
+		this.delegate.GET("",handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
 		return this;
 	}
 
@@ -150,7 +150,7 @@ public SpringdocRouteBuilder GET(String pattern, RequestPredicate predicate, Han
 	 */
 	public SpringdocRouteBuilder HEAD(HandlerFunction<ServerResponse> handlerFunction, Consumer<Builder> operationsConsumer) {
 		Builder builder = getOperationBuilder(operationsConsumer);
-		this.delegate.HEAD(handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
+		this.delegate.HEAD("",handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
 		return this;
 	}
 
@@ -210,7 +210,7 @@ public SpringdocRouteBuilder HEAD(String pattern, RequestPredicate predicate, Ha
 	 */
 	public SpringdocRouteBuilder POST(HandlerFunction<ServerResponse> handlerFunction, Consumer<Builder> operationsConsumer) {
 		Builder builder = getOperationBuilder(operationsConsumer);
-		this.delegate.POST(handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
+		this.delegate.POST("",handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
 		return this;
 	}
 
@@ -270,7 +270,7 @@ public SpringdocRouteBuilder POST(String pattern, RequestPredicate predicate, Ha
 	 */
 	public SpringdocRouteBuilder PUT(HandlerFunction<ServerResponse> handlerFunction, Consumer<Builder> operationsConsumer) {
 		Builder builder = getOperationBuilder(operationsConsumer);
-		this.delegate.PUT(handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
+		this.delegate.PUT("",handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
 		return this;
 	}
 
@@ -330,7 +330,7 @@ public SpringdocRouteBuilder PUT(String pattern, RequestPredicate predicate, Han
 	 */
 	public SpringdocRouteBuilder PATCH(HandlerFunction<ServerResponse> handlerFunction, Consumer<Builder> operationsConsumer) {
 		Builder builder = getOperationBuilder(operationsConsumer);
-		this.delegate.PATCH(handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
+		this.delegate.PATCH("",handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
 		return this;
 	}
 
@@ -390,7 +390,7 @@ public SpringdocRouteBuilder PATCH(String pattern, RequestPredicate predicate, H
 	 */
 	public SpringdocRouteBuilder DELETE(HandlerFunction<ServerResponse> handlerFunction, Consumer<Builder> operationsConsumer) {
 		Builder builder = getOperationBuilder(operationsConsumer);
-		this.delegate.DELETE(handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
+		this.delegate.DELETE("",handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
 		return this;
 	}
 
@@ -450,7 +450,7 @@ public SpringdocRouteBuilder DELETE(String pattern, RequestPredicate predicate,
 	 */
 	public SpringdocRouteBuilder OPTIONS(HandlerFunction<ServerResponse> handlerFunction, Consumer<Builder> operationsConsumer) {
 		Builder builder = getOperationBuilder(operationsConsumer);
-		this.delegate.OPTIONS(handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
+		this.delegate.OPTIONS("",handlerFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
 		return this;
 	}
 

springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app150/HelloRouter.java

@@ -52,7 +52,7 @@ RouterFunction<?> routeSample() {
 
 			return 	RouterFunctions.nest(RequestPredicates.path("/users"), nest(path("/test"), nest(path("/greeter"),
 					SpringdocRouteBuilder.route()
-						.GET("", HANDLER_FUNCTION, builder -> builder.operationId("get-users"))
+						.GET( HANDLER_FUNCTION, builder -> builder.operationId("get-users"))
 						.POST("/special", HANDLER_FUNCTION, builder -> builder.operationId("create-user-special"))
 						.nest(path("/groups"), routerFunctionSupplier, operationsConsumer)
 						.nest(path("/groups2"), routerFunctionSupplier, operationsConsumer)