Skip to content

Commit 242be2d

Browse files
bnasslahsenbnasslahsen
committed
Merge branch 'JohnNiang-chore/remove-unused-operations-builder'
2 parents f09afb9 + ddbc149 commit 242be2d

6 files changed

Lines changed: 36 additions & 77 deletions

File tree

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

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -552,12 +552,10 @@ public SpringdocRouteBuilder resources(Function<ServerRequest, Mono<Resource>> l
552552
*
553553
* @param predicate the predicate
554554
* @param routerFunctionSupplier the router function supplier
555-
* @param operationsConsumer the operations consumer
556555
* @return the springdoc route builder
557556
*/
558-
public SpringdocRouteBuilder nest(RequestPredicate predicate, Supplier<RouterFunction<ServerResponse>> routerFunctionSupplier, Consumer<Builder> operationsConsumer) {
559-
Builder builder = getOperationBuilder(operationsConsumer);
560-
this.delegate.nest(predicate, routerFunctionSupplier).withAttribute(OPERATION_ATTRIBUTE, builder);
557+
public SpringdocRouteBuilder nest(RequestPredicate predicate, Supplier<RouterFunction<ServerResponse>> routerFunctionSupplier) {
558+
this.delegate.nest(predicate, routerFunctionSupplier);
561559
return this;
562560
}
563561

@@ -567,12 +565,10 @@ public SpringdocRouteBuilder nest(RequestPredicate predicate, Supplier<RouterFun
567565
*
568566
* @param predicate the predicate
569567
* @param builderConsumer the builder consumer
570-
* @param operationsConsumer the operations consumer
571568
* @return the springdoc route builder
572569
*/
573-
public SpringdocRouteBuilder nest(RequestPredicate predicate, Consumer<RouterFunctions.Builder> builderConsumer, Consumer<Builder> operationsConsumer) {
574-
Builder builder = getOperationBuilder(operationsConsumer);
575-
this.delegate.nest(predicate, builderConsumer).withAttribute(OPERATION_ATTRIBUTE, builder);
570+
public SpringdocRouteBuilder nest(RequestPredicate predicate, Consumer<RouterFunctions.Builder> builderConsumer) {
571+
this.delegate.nest(predicate, builderConsumer);
576572
return this;
577573
}
578574

@@ -611,26 +607,21 @@ public SpringdocRouteBuilder path(String pattern, Consumer<RouterFunctions.Build
611607
* Filter springdoc route builder.
612608
*
613609
* @param filterFunction the filter function
614-
* @param operationsConsumer the operations consumer
615610
* @return the springdoc route builder
616611
*/
617-
public SpringdocRouteBuilder filter(HandlerFilterFunction<ServerResponse, ServerResponse> filterFunction, Consumer<Builder> operationsConsumer) {
618-
Builder builder = getOperationBuilder(operationsConsumer);
619-
this.delegate.filter(filterFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
612+
public SpringdocRouteBuilder filter(HandlerFilterFunction<ServerResponse, ServerResponse> filterFunction) {
613+
this.delegate.filter(filterFunction);
620614
return this;
621615
}
622616

623617

624618
/**
625619
* Before springdoc route builder.
626620
*
627-
* @param requestProcessor the request processor
628-
* @param operationsConsumer the operations consumer
629621
* @return the springdoc route builder
630622
*/
631-
public SpringdocRouteBuilder before(UnaryOperator<ServerRequest> requestProcessor, Consumer<Builder> operationsConsumer) {
632-
Builder builder = getOperationBuilder(operationsConsumer);
633-
this.delegate.before(requestProcessor).withAttribute(OPERATION_ATTRIBUTE, builder);
623+
public SpringdocRouteBuilder before(UnaryOperator<ServerRequest> requestProcessor) {
624+
this.delegate.before(requestProcessor);
634625
return this;
635626
}
636627

@@ -639,12 +630,10 @@ public SpringdocRouteBuilder before(UnaryOperator<ServerRequest> requestProcesso
639630
* After springdoc route builder.
640631
*
641632
* @param responseProcessor the response processor
642-
* @param operationsConsumer the operations consumer
643633
* @return the springdoc route builder
644634
*/
645-
public SpringdocRouteBuilder after(BiFunction<ServerRequest, ServerResponse, ServerResponse> responseProcessor, Consumer<Builder> operationsConsumer) {
646-
Builder builder = getOperationBuilder(operationsConsumer);
647-
this.delegate.after(responseProcessor).withAttribute(OPERATION_ATTRIBUTE, builder);
635+
public SpringdocRouteBuilder after(BiFunction<ServerRequest, ServerResponse, ServerResponse> responseProcessor) {
636+
this.delegate.after(responseProcessor);
648637
return this;
649638
}
650639

‎springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app150/HelloRouter.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626

2727
package test.org.springdoc.api.v30.app150;
2828

29-
import java.util.function.Consumer;
3029
import java.util.function.Supplier;
3130

32-
import org.springdoc.core.fn.builders.operation.Builder;
3331
import org.springdoc.webflux.core.fn.SpringdocRouteBuilder;
3432

3533
import org.springframework.context.annotation.Bean;
@@ -54,16 +52,13 @@ RouterFunction<?> routeSample() {
5452

5553
.POST("/titi", HANDLER_FUNCTION, builder -> builder.operationId("create-user-group-special")).build();
5654

57-
Consumer<Builder> operationsConsumer = builder -> {
58-
};
59-
60-
return RouterFunctions.nest(RequestPredicates.path("/users"), nest(path("/test"), nest(path("/greeter"),
55+
return RouterFunctions.nest(RequestPredicates.path("/users"), nest(path("/test"), nest(path("/greeter"),
6156
SpringdocRouteBuilder.route()
6257
.GET(HANDLER_FUNCTION, builder -> builder.operationId("get-users"))
6358
.POST("/special", HANDLER_FUNCTION, builder -> builder.operationId("create-user-special"))
64-
.nest(path("/groups"), routerFunctionSupplier, operationsConsumer)
65-
.nest(path("/groups2"), routerFunctionSupplier, operationsConsumer)
66-
.nest(path("/greeter3").or(path("/greeter4")), routerFunctionSupplier, operationsConsumer)
59+
.nest(path("/groups"), routerFunctionSupplier)
60+
.nest(path("/groups2"), routerFunctionSupplier)
61+
.nest(path("/greeter3").or(path("/greeter4")), routerFunctionSupplier)
6762
.build())));
6863

6964
}

‎springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app151/HelloRouter.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626

2727
package test.org.springdoc.api.v30.app151;
2828

29-
import java.util.function.Consumer;
3029
import java.util.function.Supplier;
3130

32-
import org.springdoc.core.fn.builders.operation.Builder;
3331
import org.springdoc.webflux.core.fn.SpringdocRouteBuilder;
3432

3533
import org.springframework.context.annotation.Bean;
@@ -54,16 +52,13 @@ RouterFunction<?> routeSample() {
5452

5553
.POST("/titi", HANDLER_FUNCTION, builder -> builder.operationId("create-user-group-special")).build();
5654

57-
Consumer<Builder> operationsConsumer = builder -> {
58-
};
59-
60-
return RouterFunctions.nest(RequestPredicates.path("/users"), nest(path("/test"), nest(path("/greeter"),
55+
return RouterFunctions.nest(RequestPredicates.path("/users"), nest(path("/test"), nest(path("/greeter"),
6156
SpringdocRouteBuilder.route()
6257
.GET("", HANDLER_FUNCTION, builder -> builder.operationId("get-users"))
6358
.POST("/special", HANDLER_FUNCTION, builder -> builder.operationId("create-user-special"))
64-
.nest(path("/groups"), routerFunctionSupplier, operationsConsumer)
65-
.nest(path("/groups2"), routerFunctionSupplier, operationsConsumer)
66-
.nest(path("/greeter3").or(path("/greeter4")), routerFunctionSupplier, operationsConsumer)
59+
.nest(path("/groups"), routerFunctionSupplier)
60+
.nest(path("/groups2"), routerFunctionSupplier)
61+
.nest(path("/greeter3").or(path("/greeter4")), routerFunctionSupplier)
6762
.build())));
6863

6964
}

‎springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app150/HelloRouter.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626

2727
package test.org.springdoc.api.v31.app150;
2828

29-
import java.util.function.Consumer;
3029
import java.util.function.Supplier;
3130

32-
import org.springdoc.core.fn.builders.operation.Builder;
3331
import org.springdoc.webflux.core.fn.SpringdocRouteBuilder;
3432

3533
import org.springframework.context.annotation.Bean;
@@ -54,16 +52,13 @@ RouterFunction<?> routeSample() {
5452

5553
.POST("/titi", HANDLER_FUNCTION, builder -> builder.operationId("create-user-group-special")).build();
5654

57-
Consumer<Builder> operationsConsumer = builder -> {
58-
};
59-
60-
return RouterFunctions.nest(RequestPredicates.path("/users"), nest(path("/test"), nest(path("/greeter"),
55+
return RouterFunctions.nest(RequestPredicates.path("/users"), nest(path("/test"), nest(path("/greeter"),
6156
SpringdocRouteBuilder.route()
6257
.GET(HANDLER_FUNCTION, builder -> builder.operationId("get-users"))
6358
.POST("/special", HANDLER_FUNCTION, builder -> builder.operationId("create-user-special"))
64-
.nest(path("/groups"), routerFunctionSupplier, operationsConsumer)
65-
.nest(path("/groups2"), routerFunctionSupplier, operationsConsumer)
66-
.nest(path("/greeter3").or(path("/greeter4")), routerFunctionSupplier, operationsConsumer)
59+
.nest(path("/groups"), routerFunctionSupplier)
60+
.nest(path("/groups2"), routerFunctionSupplier)
61+
.nest(path("/greeter3").or(path("/greeter4")), routerFunctionSupplier)
6762
.build())));
6863

6964
}

‎springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app151/HelloRouter.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626

2727
package test.org.springdoc.api.v31.app151;
2828

29-
import java.util.function.Consumer;
3029
import java.util.function.Supplier;
3130

32-
import org.springdoc.core.fn.builders.operation.Builder;
3331
import org.springdoc.webflux.core.fn.SpringdocRouteBuilder;
3432

3533
import org.springframework.context.annotation.Bean;
@@ -54,16 +52,13 @@ RouterFunction<?> routeSample() {
5452

5553
.POST("/titi", HANDLER_FUNCTION, builder -> builder.operationId("create-user-group-special")).build();
5654

57-
Consumer<Builder> operationsConsumer = builder -> {
58-
};
59-
60-
return RouterFunctions.nest(RequestPredicates.path("/users"), nest(path("/test"), nest(path("/greeter"),
55+
return RouterFunctions.nest(RequestPredicates.path("/users"), nest(path("/test"), nest(path("/greeter"),
6156
SpringdocRouteBuilder.route()
6257
.GET("", HANDLER_FUNCTION, builder -> builder.operationId("get-users"))
6358
.POST("/special", HANDLER_FUNCTION, builder -> builder.operationId("create-user-special"))
64-
.nest(path("/groups"), routerFunctionSupplier, operationsConsumer)
65-
.nest(path("/groups2"), routerFunctionSupplier, operationsConsumer)
66-
.nest(path("/greeter3").or(path("/greeter4")), routerFunctionSupplier, operationsConsumer)
59+
.nest(path("/groups"), routerFunctionSupplier)
60+
.nest(path("/groups2"), routerFunctionSupplier)
61+
.nest(path("/greeter3").or(path("/greeter4")), routerFunctionSupplier)
6762
.build())));
6863

6964
}

‎springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/fn/SpringdocRouteBuilder.java‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -552,12 +552,10 @@ public SpringdocRouteBuilder resources(Function<ServerRequest, Optional<Resource
552552
*
553553
* @param predicate the predicate
554554
* @param routerFunctionSupplier the router function supplier
555-
* @param operationsConsumer the operations consumer
556555
* @return the springdoc route builder
557556
*/
558-
public SpringdocRouteBuilder nest(RequestPredicate predicate, Supplier<RouterFunction<ServerResponse>> routerFunctionSupplier, Consumer<Builder> operationsConsumer) {
559-
Builder builder = getOperationBuilder(operationsConsumer);
560-
this.delegate.nest(predicate, routerFunctionSupplier).withAttribute(OPERATION_ATTRIBUTE, builder);
557+
public SpringdocRouteBuilder nest(RequestPredicate predicate, Supplier<RouterFunction<ServerResponse>> routerFunctionSupplier) {
558+
this.delegate.nest(predicate, routerFunctionSupplier);
561559
return this;
562560
}
563561

@@ -567,12 +565,10 @@ public SpringdocRouteBuilder nest(RequestPredicate predicate, Supplier<RouterFun
567565
*
568566
* @param predicate the predicate
569567
* @param builderConsumer the builder consumer
570-
* @param operationsConsumer the operations consumer
571568
* @return the springdoc route builder
572569
*/
573-
public SpringdocRouteBuilder nest(RequestPredicate predicate, Consumer<RouterFunctions.Builder> builderConsumer, Consumer<Builder> operationsConsumer) {
574-
Builder builder = getOperationBuilder(operationsConsumer);
575-
this.delegate.nest(predicate, builderConsumer).withAttribute(OPERATION_ATTRIBUTE, builder);
570+
public SpringdocRouteBuilder nest(RequestPredicate predicate, Consumer<RouterFunctions.Builder> builderConsumer) {
571+
this.delegate.nest(predicate, builderConsumer);
576572
return this;
577573
}
578574

@@ -611,12 +607,10 @@ public SpringdocRouteBuilder path(String pattern, Consumer<RouterFunctions.Build
611607
* Filter springdoc route builder.
612608
*
613609
* @param filterFunction the filter function
614-
* @param operationsConsumer the operations consumer
615610
* @return the springdoc route builder
616611
*/
617-
public SpringdocRouteBuilder filter(HandlerFilterFunction<ServerResponse, ServerResponse> filterFunction, Consumer<Builder> operationsConsumer) {
618-
Builder builder = getOperationBuilder(operationsConsumer);
619-
this.delegate.filter(filterFunction).withAttribute(OPERATION_ATTRIBUTE, builder);
612+
public SpringdocRouteBuilder filter(HandlerFilterFunction<ServerResponse, ServerResponse> filterFunction) {
613+
this.delegate.filter(filterFunction);
620614
return this;
621615
}
622616

@@ -625,12 +619,10 @@ public SpringdocRouteBuilder filter(HandlerFilterFunction<ServerResponse, Server
625619
* Before springdoc route builder.
626620
*
627621
* @param requestProcessor the request processor
628-
* @param operationsConsumer the operations consumer
629622
* @return the springdoc route builder
630623
*/
631-
public SpringdocRouteBuilder before(UnaryOperator<ServerRequest> requestProcessor, Consumer<Builder> operationsConsumer) {
632-
Builder builder = getOperationBuilder(operationsConsumer);
633-
this.delegate.before(requestProcessor).withAttribute(OPERATION_ATTRIBUTE, builder);
624+
public SpringdocRouteBuilder before(UnaryOperator<ServerRequest> requestProcessor) {
625+
this.delegate.before(requestProcessor);
634626
return this;
635627
}
636628

@@ -639,12 +631,10 @@ public SpringdocRouteBuilder before(UnaryOperator<ServerRequest> requestProcesso
639631
* After springdoc route builder.
640632
*
641633
* @param responseProcessor the response processor
642-
* @param operationsConsumer the operations consumer
643634
* @return the springdoc route builder
644635
*/
645-
public SpringdocRouteBuilder after(BiFunction<ServerRequest, ServerResponse, ServerResponse> responseProcessor, Consumer<Builder> operationsConsumer) {
646-
Builder builder = getOperationBuilder(operationsConsumer);
647-
this.delegate.after(responseProcessor).withAttribute(OPERATION_ATTRIBUTE, builder);
636+
public SpringdocRouteBuilder after(BiFunction<ServerRequest, ServerResponse, ServerResponse> responseProcessor) {
637+
this.delegate.after(responseProcessor);
648638
return this;
649639
}
650640

0 commit comments

Comments
 (0)