Polish

See spring-projectsgh-32502

Author: snicoll

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java

@@ -247,6 +247,7 @@ private Mono<Object[]> getMethodArgumentValues(
 		if (ObjectUtils.isEmpty(parameters)) {
 			return EMPTY_ARGS;
 		}
+
 		List<Mono<Object>> argMonos = new ArrayList<>(parameters.length);
 		for (MethodParameter parameter : parameters) {
 			parameter.initParameterNameDiscovery(this.parameterNameDiscoverer);

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,6 +104,12 @@ class ControllerMethodResolver {
 
 	private final ReactiveAdapterRegistry reactiveAdapterRegistry;
 
+	@Nullable
+	private final Scheduler invocationScheduler;
+
+	@Nullable
+	private final Predicate<? super HandlerMethod> blockingMethodPredicate;
+
 	@Nullable
 	private final MethodValidator methodValidator;
 
@@ -122,12 +128,6 @@ class ControllerMethodResolver {
 
 	private final Map<Class<?>, SessionAttributesHandler> sessionAttributesHandlerCache = new ConcurrentHashMap<>(64);
 
-	@Nullable
-	private final Scheduler invocationScheduler;
-
-	@Nullable
-	private final Predicate<? super HandlerMethod> blockingMethodPredicate;
-
 
 	ControllerMethodResolver(
 			ArgumentResolverConfigurer customResolvers, ReactiveAdapterRegistry adapterRegistry,
@@ -323,9 +323,7 @@ public InvocableHandlerMethod getRequestMappingMethod(HandlerMethod handlerMetho
 		invocable.setArgumentResolvers(this.requestMappingResolvers);
 		invocable.setReactiveAdapterRegistry(this.reactiveAdapterRegistry);
 		invocable.setMethodValidator(this.methodValidator);
-		//getSchedulerFor returns null if not applicable, which is ok here
 		invocable.setInvocationScheduler(getSchedulerFor(handlerMethod));
-
 		return invocable;
 	}
 

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java

@@ -105,7 +105,7 @@ void resolveNoArgs() {
 
 	@Test
 	void resolveNoArgsOnSchedulerThread() {
-		Method method = ResolvableMethod.on(TestController.class).mockCall(o -> o.noArgsThread()).method();
+		Method method = ResolvableMethod.on(TestController.class).mockCall(TestController::noArgsThread).method();
 		Mono<HandlerResult> mono = invokeOnScheduler(Schedulers.newSingle("good"), new TestController(), method);
 
 		assertHandlerResultValue(mono, "on thread: good-", false);

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ControllerAdviceTests.java

@@ -217,7 +217,9 @@ private HandlerResult handle(RequestMappingHandlerAdapter adapter,
 
 		Method method = controller.getClass().getMethod(methodName, parameterTypes);
 		HandlerMethod handlerMethod = new HandlerMethod(controller, method);
-		return adapter.handle(exchange, handlerMethod).block(timeout);
+		HandlerResult handlerResult = adapter.handle(exchange, handlerMethod).block(timeout);
+		assertThat(handlerResult).isNotNull();
+		return handlerResult;
 	}
 
 

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelInitializerTests.java

@@ -80,8 +80,7 @@ void setup() {
 
 		ControllerMethodResolver methodResolver = new ControllerMethodResolver(
 				resolverConfigurer, adapterRegistry, new StaticApplicationContext(),
-				Collections.emptyList(), null,
-				null, null);
+				Collections.emptyList(), null, null, null);
 
 		this.modelInitializer = new ModelInitializer(methodResolver, adapterRegistry);
 	}

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,10 +78,8 @@ void emptyMapping(HttpServer httpServer) throws Exception {
 		url += "/";
 		assertThat(getRestTemplate().getForObject(url, String.class)).isEqualTo("root");
 
-		assertThat(getApplicationContext().getBean(TestExecutor.class).invocationCount.get())
-				.as("executor").isEqualTo(4);
-		assertThat(getApplicationContext().getBean(TestPredicate.class).invocationCount.get())
-				.as("predicate").isEqualTo(4);
+		assertThat(getApplicationContext().getBean(TestExecutor.class).invocationCount.get()).isEqualTo(4);
+		assertThat(getApplicationContext().getBean(TestPredicate.class).invocationCount.get()).isEqualTo(4);
 	}
 
 	@ParameterizedHttpServerTest

spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/ModelInitializerKotlinTests.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.