Skip to content

Commit 296af61

Browse files
committed
SpringdocRouteBuilder.onError is overriding last route defined. Fixes #2399
1 parent b6f9c1d commit 296af61

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -651,12 +651,10 @@ public SpringdocRouteBuilder after(BiFunction<ServerRequest, ServerResponse, Ser
651651
*
652652
* @param predicate the predicate
653653
* @param responseProvider the response provider
654-
* @param operationsConsumer the operations consumer
655654
* @return the springdoc route builder
656655
*/
657-
public SpringdocRouteBuilder onError(Predicate<? super Throwable> predicate, BiFunction<? super Throwable, ServerRequest, Mono<ServerResponse>> responseProvider, Consumer<Builder> operationsConsumer) {
658-
Builder builder = getOperationBuilder(operationsConsumer);
659-
this.delegate.onError(predicate, responseProvider).withAttribute(OPERATION_ATTRIBUTE, builder);
656+
public SpringdocRouteBuilder onError(Predicate<? super Throwable> predicate, BiFunction<? super Throwable, ServerRequest, Mono<ServerResponse>> responseProvider) {
657+
this.delegate.onError(predicate, responseProvider);
660658
return this;
661659
}
662660

@@ -667,12 +665,10 @@ public SpringdocRouteBuilder onError(Predicate<? super Throwable> predicate, BiF
667665
* @param <T> the type parameter
668666
* @param exceptionType the exception type
669667
* @param responseProvider the response provider
670-
* @param operationsConsumer the operations consumer
671668
* @return the springdoc route builder
672669
*/
673-
public <T extends Throwable> SpringdocRouteBuilder onError(Class<T> exceptionType, BiFunction<? super T, ServerRequest, Mono<ServerResponse>> responseProvider, Consumer<Builder> operationsConsumer) {
674-
Builder builder = getOperationBuilder(operationsConsumer);
675-
this.delegate.onError(exceptionType, responseProvider).withAttribute(OPERATION_ATTRIBUTE, builder);
670+
public <T extends Throwable> SpringdocRouteBuilder onError(Class<T> exceptionType, BiFunction<? super T, ServerRequest, Mono<ServerResponse>> responseProvider) {
671+
this.delegate.onError(exceptionType, responseProvider);
676672
return this;
677673
}
678674

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -651,12 +651,10 @@ public SpringdocRouteBuilder after(BiFunction<ServerRequest, ServerResponse, Ser
651651
*
652652
* @param predicate the predicate
653653
* @param responseProvider the response provider
654-
* @param operationsConsumer the operations consumer
655654
* @return the springdoc route builder
656655
*/
657-
public SpringdocRouteBuilder onError(Predicate<Throwable> predicate, BiFunction<Throwable, ServerRequest, ServerResponse> responseProvider, Consumer<Builder> operationsConsumer) {
658-
Builder builder = getOperationBuilder(operationsConsumer);
659-
this.delegate.onError(predicate, responseProvider).withAttribute(OPERATION_ATTRIBUTE, builder);
656+
public SpringdocRouteBuilder onError(Predicate<Throwable> predicate, BiFunction<Throwable, ServerRequest, ServerResponse> responseProvider) {
657+
this.delegate.onError(predicate, responseProvider);
660658
return this;
661659
}
662660

@@ -667,12 +665,10 @@ public SpringdocRouteBuilder onError(Predicate<Throwable> predicate, BiFunction<
667665
* @param <T> the type parameter
668666
* @param exceptionType the exception type
669667
* @param responseProvider the response provider
670-
* @param operationsConsumer the operations consumer
671668
* @return the springdoc route builder
672669
*/
673-
public <T extends Throwable> SpringdocRouteBuilder onError(Class<T> exceptionType, BiFunction<Throwable, ServerRequest, ServerResponse> responseProvider, Consumer<Builder> operationsConsumer) {
674-
Builder builder = getOperationBuilder(operationsConsumer);
675-
this.delegate.onError(exceptionType, responseProvider).withAttribute(OPERATION_ATTRIBUTE, builder);
670+
public <T extends Throwable> SpringdocRouteBuilder onError(Class<T> exceptionType, BiFunction<Throwable, ServerRequest, ServerResponse> responseProvider) {
671+
this.delegate.onError(exceptionType, responseProvider);
676672
return this;
677673
}
678674

0 commit comments

Comments
 (0)