Rename async methods

See gh-36084

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<String> resolveVersionAsync(ServerWebExchange exchange){
+	default Mono<String> resolveApiVersion(ServerWebExchange exchange){
 		return Mono.justOrEmpty(this.resolveVersion(exchange));
 	}
 

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<String> resolveVersionAsync(ServerWebExchange exchange) {
+	default Mono<String> 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<Comparable<?>> resolveParseAndValidate(ServerWebExchange exchange) {
-		return this.resolveVersionAsync(exchange)
+	default Mono<Comparable<?>> resolveParseAndValidateApiVersion(ServerWebExchange exchange) {
+		return this.resolveApiVersion(exchange)
 				.switchIfEmpty(Mono.justOrEmpty(this.getDefaultVersion())
 						.mapNotNull(comparable -> comparable.toString()))
 				.<Comparable<?>>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) {

spring-webflux/src/main/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategy.java

@@ -167,9 +167,9 @@ public class DefaultApiVersionStrategy implements ApiVersionStrategy {
 	}
 
 	@Override
-	public Mono<String> resolveVersionAsync(ServerWebExchange exchange) {
+	public Mono<String> resolveApiVersion(ServerWebExchange exchange) {
 		return Flux.fromIterable(this.versionResolvers)
-				.flatMap(resolver -> resolver.resolveVersionAsync(exchange))
+				.flatMap(resolver -> resolver.resolveApiVersion(exchange))
 				.next();
 	}
 

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));
 			}

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);
 	}
 
 }