Polish

Author: rstoyanchev

spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethodTests.java

@@ -18,7 +18,6 @@
 
 import java.lang.reflect.Method;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.core.MethodParameter;
@@ -27,6 +26,7 @@
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 /**
  * Unit tests for {@link InvocableHandlerMethod}.
@@ -35,17 +35,11 @@
  */
 public class InvocableHandlerMethodTests {
 
-	private Message<?> message;
+	private final Message<?> message = mock(Message.class);
 
 	private final HandlerMethodArgumentResolverComposite composite = new HandlerMethodArgumentResolverComposite();
 
 
-	@Before
-	public void setUp() {
-		this.message = null;
-	}
-
-
 	@Test
 	public void resolveArg() throws Exception {
 		this.composite.addResolver(new StubArgumentResolver(99));
@@ -61,7 +55,7 @@ public void resolveArg() throws Exception {
 	}
 
 	@Test
-	public void resolveNullArg() throws Exception {
+	public void resolveNoArgValue() throws Exception {
 		this.composite.addResolver(new StubArgumentResolver(Integer.class));
 		this.composite.addResolver(new StubArgumentResolver(String.class));
 
@@ -135,35 +129,33 @@ public void illegalArgumentException() throws Exception {
 
 	@Test
 	public void invocationTargetException() throws Exception {
-		Throwable expected = new RuntimeException("error");
+		Throwable expected = null;
 		try {
+			expected = new RuntimeException("error");
 			getInvocable("handleWithException", Throwable.class).invoke(this.message, expected);
 			fail("Expected exception");
 		}
 		catch (RuntimeException actual) {
 			assertSame(expected, actual);
 		}
-
-		expected = new Error("error");
 		try {
+			expected = new Error("error");
 			getInvocable("handleWithException", Throwable.class).invoke(this.message, expected);
 			fail("Expected exception");
 		}
 		catch (Error actual) {
 			assertSame(expected, actual);
 		}
-
-		expected = new Exception("error");
 		try {
+			expected = new Exception("error");
 			getInvocable("handleWithException", Throwable.class).invoke(this.message, expected);
 			fail("Expected exception");
 		}
 		catch (Exception actual) {
 			assertSame(expected, actual);
 		}
-
-		expected = new Throwable("error");
 		try {
+			expected = new Throwable("error");
 			getInvocable("handleWithException", Throwable.class).invoke(this.message, expected);
 			fail("Expected exception");
 		}

spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java

@@ -65,7 +65,7 @@ public void resolveArg() throws Exception {
 	}
 
 	@Test
-	public void resolveNullArg() throws Exception {
+	public void resolveNoArgValue() throws Exception {
 		this.composite.addResolver(new StubArgumentResolver(Integer.class));
 		this.composite.addResolver(new StubArgumentResolver(String.class));
 

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

@@ -59,7 +59,6 @@ public HandlerMethodArgumentResolverComposite addResolver(HandlerMethodArgumentR
 
 	/**
 	 * Add the given {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}.
-	 * @since 4.3
 	 */
 	public HandlerMethodArgumentResolverComposite addResolvers(@Nullable HandlerMethodArgumentResolver... resolvers) {
 		if (resolvers != null) {
@@ -89,7 +88,6 @@ public List<HandlerMethodArgumentResolver> getResolvers() {
 
 	/**
 	 * Clear the list of configured resolvers.
-	 * @since 4.3
 	 */
 	public void clear() {
 		this.argumentResolvers.clear();

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

@@ -141,7 +141,7 @@ public Mono<HandlerResult> invoke(
 			catch (IllegalArgumentException ex) {
 				assertTargetBean(getBridgedMethod(), getBean(), args);
 				String text = (ex.getMessage() != null ? ex.getMessage() : "Illegal argument");
-				throw new IllegalStateException(formatInvokeError(text, args), ex);
+				return Mono.error(new IllegalStateException(formatInvokeError(text, args), ex));
 			}
 			catch (InvocationTargetException ex) {
 				return Mono.error(ex.getTargetException());
@@ -213,11 +213,9 @@ private void logArgumentErrorIfNecessary(
 		}
 	}
 
-	private boolean isAsyncVoidReturnType(MethodParameter returnType,
-			@Nullable ReactiveAdapter reactiveAdapter) {
-
-		if (reactiveAdapter != null && reactiveAdapter.supportsEmpty()) {
-			if (reactiveAdapter.isNoValue()) {
+	private static boolean isAsyncVoidReturnType(MethodParameter returnType, @Nullable ReactiveAdapter adapter) {
+		if (adapter != null && adapter.supportsEmpty()) {
+			if (adapter.isNoValue()) {
 				return true;
 			}
 			Type parameterType = returnType.getGenericParameterType();