From dcf5d69d94a67a1d4dbf61bbf8210de24f41a503 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Thu, 8 Jan 2026 13:10:58 +0000 Subject: [PATCH] Rename async methods See gh-36084 --- .../web/reactive/accept/ApiVersionResolver.java | 2 +- .../web/reactive/accept/ApiVersionStrategy.java | 10 +++++----- .../web/reactive/accept/DefaultApiVersionStrategy.java | 4 ++-- .../web/reactive/handler/AbstractHandlerMapping.java | 2 +- .../accept/DefaultApiVersionStrategiesTests.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ApiVersionResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ApiVersionResolver.java index 084198518b9..020c8ce1ecc 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ApiVersionResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ApiVersionResolver.java @@ -40,7 +40,7 @@ interface ApiVersionResolver { * @return {@code Mono} emitting the version value, or an empty {@code Mono} * @since 7.0.3 */ - default Mono resolveVersionAsync(ServerWebExchange exchange){ + default Mono resolveApiVersion(ServerWebExchange exchange){ return Mono.justOrEmpty(this.resolveVersion(exchange)); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ApiVersionStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ApiVersionStrategy.java index 38ce07b6def..2e084aa7a29 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ApiVersionStrategy.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ApiVersionStrategy.java @@ -42,7 +42,7 @@ public interface ApiVersionStrategy { * @since 7.0.3 * @see ApiVersionResolver */ - default Mono resolveVersionAsync(ServerWebExchange exchange) { + default Mono resolveApiVersion(ServerWebExchange exchange) { return Mono.justOrEmpty(resolveVersion(exchange)); } @@ -51,7 +51,7 @@ public interface ApiVersionStrategy { * @param exchange the current exchange * @return the version, if present or {@code null} * @see ApiVersionResolver - * @deprecated as of 7.0.3, in favor of {@link #resolveVersionAsync(ServerWebExchange)} + * @deprecated as of 7.0.3, in favor of {@link #resolveApiVersion(ServerWebExchange)} */ @Deprecated(since = "7.0.3", forRemoval = true) @Nullable @@ -89,8 +89,8 @@ public interface ApiVersionStrategy { * @since 7.0.3 */ @SuppressWarnings("Convert2MethodRef") - default Mono> resolveParseAndValidate(ServerWebExchange exchange) { - return this.resolveVersionAsync(exchange) + default Mono> resolveParseAndValidateApiVersion(ServerWebExchange exchange) { + return this.resolveApiVersion(exchange) .switchIfEmpty(Mono.justOrEmpty(this.getDefaultVersion()) .mapNotNull(comparable -> comparable.toString())) .>handle((version, sink) -> { @@ -129,7 +129,7 @@ public interface ApiVersionStrategy { * or the default version if configured. * @param exchange the current exchange * @return the parsed request version, or the default version - * @deprecated in favor of {@link #resolveParseAndValidate(ServerWebExchange)} + * @deprecated in favor of {@link #resolveParseAndValidateApiVersion(ServerWebExchange)} */ @Deprecated(since = "7.0.3", forRemoval = true) default @Nullable Comparable resolveParseAndValidateVersion(ServerWebExchange exchange) { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategy.java index ba8fcd7570a..a6fd704c2e5 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategy.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategy.java @@ -167,9 +167,9 @@ public class DefaultApiVersionStrategy implements ApiVersionStrategy { } @Override - public Mono resolveVersionAsync(ServerWebExchange exchange) { + public Mono resolveApiVersion(ServerWebExchange exchange) { return Flux.fromIterable(this.versionResolvers) - .flatMap(resolver -> resolver.resolveVersionAsync(exchange)) + .flatMap(resolver -> resolver.resolveApiVersion(exchange)) .next(); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java index 4cd924aa15b..c9e3d30abf6 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java @@ -232,7 +232,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport if (this.apiVersionStrategy != null) { if (exchange.getAttribute(API_VERSION_ATTRIBUTE) == null) { return this.apiVersionStrategy - .resolveParseAndValidate(exchange) + .resolveParseAndValidateApiVersion(exchange) .doOnNext(version -> exchange.getAttributes() .put(API_VERSION_ATTRIBUTE, version)); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategiesTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategiesTests.java index ad6fb739218..c2be3b1fe8c 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategiesTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategiesTests.java @@ -147,7 +147,7 @@ public class DefaultApiVersionStrategiesTests { builder.queryParam("api-version", version); } MockServerWebExchange exchange = MockServerWebExchange.builder(builder).build(); - return strategy.resolveParseAndValidate(exchange).map(Object::toString); + return strategy.resolveParseAndValidateApiVersion(exchange).map(Object::toString); } }