Consistent naming of HandlerMethodArgumentResolver implementations

Includes combined imports of assertion methods and related polishing.

Closes #22889

Author: jhoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -101,7 +101,7 @@ protected boolean checkParameterTypeNoReactiveWrapper(MethodParameter parameter,
 
 	private IllegalStateException buildReactiveWrapperException(MethodParameter parameter) {
 		return new IllegalStateException(getClass().getSimpleName() +
-				" doesn't support reactive type wrapper: " + parameter.getGenericParameterType());
+				" does not support reactive type wrapper: " + parameter.getGenericParameterType());
 	}
 
 	/**

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

@@ -178,7 +178,7 @@ private static List<HandlerMethodArgumentResolver> initResolvers(ArgumentResolve
 		result.add(new MatrixVariableMethodArgumentResolver(beanFactory, adapterRegistry));
 		result.add(new MatrixVariableMapMethodArgumentResolver(adapterRegistry));
 		if (!readers.isEmpty()) {
-			result.add(new RequestBodyArgumentResolver(readers, adapterRegistry));
+			result.add(new RequestBodyMethodArgumentResolver(readers, adapterRegistry));
 			result.add(new RequestPartMethodArgumentResolver(readers, adapterRegistry));
 		}
 		if (supportDataBinding) {
@@ -196,18 +196,18 @@ private static List<HandlerMethodArgumentResolver> initResolvers(ArgumentResolve
 			result.add(new ContinuationHandlerMethodArgumentResolver());
 		}
 		if (!readers.isEmpty()) {
-			result.add(new HttpEntityArgumentResolver(readers, adapterRegistry));
+			result.add(new HttpEntityMethodArgumentResolver(readers, adapterRegistry));
 		}
-		result.add(new ModelArgumentResolver(adapterRegistry));
+		result.add(new ModelMethodArgumentResolver(adapterRegistry));
 		if (supportDataBinding) {
 			result.add(new ErrorsMethodArgumentResolver(adapterRegistry));
 		}
-		result.add(new ServerWebExchangeArgumentResolver(adapterRegistry));
-		result.add(new PrincipalArgumentResolver(adapterRegistry));
+		result.add(new ServerWebExchangeMethodArgumentResolver(adapterRegistry));
+		result.add(new PrincipalMethodArgumentResolver(adapterRegistry));
 		if (requestMappingMethod) {
 			result.add(new SessionStatusMethodArgumentResolver());
 		}
-		result.add(new WebSessionArgumentResolver(adapterRegistry));
+		result.add(new WebSessionMethodArgumentResolver(adapterRegistry));
 
 		// Custom...
 		result.addAll(customResolvers.getCustomResolvers());

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolver.java renamed to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -36,11 +36,11 @@
  * {@code HttpMessageReader}.
  *
  * @author Rossen Stoyanchev
- * @since 5.0
+ * @since 5.2
  */
-public class HttpEntityArgumentResolver extends AbstractMessageReaderArgumentResolver {
+public class HttpEntityMethodArgumentResolver extends AbstractMessageReaderArgumentResolver {
 
-	public HttpEntityArgumentResolver(List<HttpMessageReader<?>> readers, ReactiveAdapterRegistry registry) {
+	public HttpEntityMethodArgumentResolver(List<HttpMessageReader<?>> readers, ReactiveAdapterRegistry registry) {
 		super(readers, registry);
 	}
 

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelArgumentResolver.java renamed to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelMethodArgumentResolver.java

@@ -36,12 +36,12 @@
  * parameter of type {@code Map} is also annotated.
  *
  * @author Rossen Stoyanchev
- * @since 5.0
+ * @since 5.2
  */
-public class ModelArgumentResolver extends HandlerMethodArgumentResolverSupport
+public class ModelMethodArgumentResolver extends HandlerMethodArgumentResolverSupport
 		implements SyncHandlerMethodArgumentResolver {
 
-	public ModelArgumentResolver(ReactiveAdapterRegistry adapterRegistry) {
+	public ModelMethodArgumentResolver(ReactiveAdapterRegistry adapterRegistry) {
 		super(adapterRegistry);
 	}
 

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PrincipalArgumentResolver.java renamed to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PrincipalMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -31,12 +31,12 @@
  * Resolves method argument value of type {@link java.security.Principal}.
  *
  * @author Rossen Stoyanchev
- * @since 5.0
- * @see ServerWebExchangeArgumentResolver
+ * @since 5.2
+ * @see ServerWebExchangeMethodArgumentResolver
  */
-public class PrincipalArgumentResolver extends HandlerMethodArgumentResolverSupport {
+public class PrincipalMethodArgumentResolver extends HandlerMethodArgumentResolverSupport {
 
-	public PrincipalArgumentResolver(ReactiveAdapterRegistry adapterRegistry) {
+	public PrincipalMethodArgumentResolver(ReactiveAdapterRegistry adapterRegistry) {
 		super(adapterRegistry);
 	}
 

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java renamed to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -41,11 +41,11 @@
  * @author Sebastien Deleuze
  * @author Stephane Maldini
  * @author Rossen Stoyanchev
- * @since 5.0
+ * @since 5.2
  */
-public class RequestBodyArgumentResolver extends AbstractMessageReaderArgumentResolver {
+public class RequestBodyMethodArgumentResolver extends AbstractMessageReaderArgumentResolver {
 
-	public RequestBodyArgumentResolver(List<HttpMessageReader<?>> readers,
+	public RequestBodyMethodArgumentResolver(List<HttpMessageReader<?>> readers,
 			ReactiveAdapterRegistry registry) {
 
 		super(readers, registry);

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeArgumentResolver.java renamed to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -50,18 +50,18 @@
  * relative to the current request
  * </ul>
  *
- * <p>For the {@code WebSession} see {@link WebSessionArgumentResolver}
- * and for the {@code Principal} see {@link PrincipalArgumentResolver}.
+ * <p>For the {@code WebSession} see {@link WebSessionMethodArgumentResolver}
+ * and for the {@code Principal} see {@link PrincipalMethodArgumentResolver}.
  *
  * @author Rossen Stoyanchev
- * @since 5.0
- * @see WebSessionArgumentResolver
- * @see PrincipalArgumentResolver
+ * @since 5.2
+ * @see WebSessionMethodArgumentResolver
+ * @see PrincipalMethodArgumentResolver
  */
-public class ServerWebExchangeArgumentResolver extends HandlerMethodArgumentResolverSupport
+public class ServerWebExchangeMethodArgumentResolver extends HandlerMethodArgumentResolverSupport
 		implements SyncHandlerMethodArgumentResolver {
 
-	public ServerWebExchangeArgumentResolver(ReactiveAdapterRegistry adapterRegistry) {
+	public ServerWebExchangeMethodArgumentResolver(ReactiveAdapterRegistry adapterRegistry) {
 		super(adapterRegistry);
 	}
 

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/WebSessionArgumentResolver.java renamed to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/WebSessionMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -30,16 +30,16 @@
  * Resolves method argument value of type {@link WebSession}.
  *
  * @author Rossen Stoyanchev
- * @since 5.0
- * @see ServerWebExchangeArgumentResolver
+ * @since 5.2
+ * @see ServerWebExchangeMethodArgumentResolver
  */
-public class WebSessionArgumentResolver extends HandlerMethodArgumentResolverSupport {
+public class WebSessionMethodArgumentResolver extends HandlerMethodArgumentResolverSupport {
 
 	// We need this resolver separate from ServerWebExchangeArgumentResolver which
 	// implements SyncHandlerMethodArgumentResolver.
 
 
-	public WebSessionArgumentResolver(ReactiveAdapterRegistry adapterRegistry) {
+	public WebSessionMethodArgumentResolver(ReactiveAdapterRegistry adapterRegistry) {
 		super(adapterRegistry);
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -17,8 +17,6 @@
 
 import java.io.File;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -34,14 +32,13 @@
 import org.springframework.web.reactive.config.EnableWebFlux;
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * Integration tests related to the use of context paths.
  *
  * @author Rossen Stoyanchev
  */
-@SuppressWarnings({"unused", "WeakerAccess"})
 public class ContextPathIntegrationTests {
 
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-201 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.
@@ -44,11 +44,12 @@
 import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.HandlerResult;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 /**
  * {@code @ControllerAdvice} related tests for {@link RequestMappingHandlerAdapter}.
+ *
  * @author Rossen Stoyanchev
  */
 public class ControllerAdviceTests {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -95,7 +95,7 @@ public void requestMappingArgumentResolvers() {
 		assertEquals(PathVariableMapMethodArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(MatrixVariableMethodArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(MatrixVariableMapMethodArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(RequestBodyArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(RequestBodyMethodArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(RequestPartMethodArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(ModelAttributeMethodArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(RequestHeaderMethodArgumentResolver.class, next(resolvers, index).getClass());
@@ -106,13 +106,13 @@ public void requestMappingArgumentResolvers() {
 		assertEquals(RequestAttributeMethodArgumentResolver.class, next(resolvers, index).getClass());
 
 		assertEquals(ContinuationHandlerMethodArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(HttpEntityArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(ModelArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(HttpEntityMethodArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(ModelMethodArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(ErrorsMethodArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(ServerWebExchangeArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(PrincipalArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(ServerWebExchangeMethodArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(PrincipalMethodArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(SessionStatusMethodArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(WebSessionArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(WebSessionMethodArgumentResolver.class, next(resolvers, index).getClass());
 
 		assertEquals(CustomArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(CustomSyncArgumentResolver.class, next(resolvers, index).getClass());
@@ -145,11 +145,11 @@ public void modelAttributeArgumentResolvers() {
 		assertEquals(RequestAttributeMethodArgumentResolver.class, next(resolvers, index).getClass());
 
 		assertEquals(ContinuationHandlerMethodArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(ModelArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(ModelMethodArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(ErrorsMethodArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(ServerWebExchangeArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(PrincipalArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(WebSessionArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(ServerWebExchangeMethodArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(PrincipalMethodArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(WebSessionMethodArgumentResolver.class, next(resolvers, index).getClass());
 
 		assertEquals(CustomArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(CustomSyncArgumentResolver.class, next(resolvers, index).getClass());
@@ -180,8 +180,8 @@ public void initBinderArgumentResolvers() {
 		assertEquals(ExpressionValueMethodArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(RequestAttributeMethodArgumentResolver.class, next(resolvers, index).getClass());
 
-		assertEquals(ModelArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(ServerWebExchangeArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(ModelMethodArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(ServerWebExchangeMethodArgumentResolver.class, next(resolvers, index).getClass());
 
 		assertEquals(CustomSyncArgumentResolver.class, next(resolvers, index).getClass());
 
@@ -212,10 +212,10 @@ public void exceptionHandlerArgumentResolvers() {
 		assertEquals(RequestAttributeMethodArgumentResolver.class, next(resolvers, index).getClass());
 
 		assertEquals(ContinuationHandlerMethodArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(ModelArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(ServerWebExchangeArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(PrincipalArgumentResolver.class, next(resolvers, index).getClass());
-		assertEquals(WebSessionArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(ModelMethodArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(ServerWebExchangeMethodArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(PrincipalMethodArgumentResolver.class, next(resolvers, index).getClass());
+		assertEquals(WebSessionMethodArgumentResolver.class, next(resolvers, index).getClass());
 
 		assertEquals(CustomArgumentResolver.class, next(resolvers, index).getClass());
 		assertEquals(CustomSyncArgumentResolver.class, next(resolvers, index).getClass());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -35,10 +35,7 @@
 import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.server.ServerWebInputException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 /**
  * Test fixture with {@link CookieValueMethodArgumentResolver}.
@@ -91,7 +88,7 @@ public void doesNotSupportParameter() {
 		catch (IllegalStateException ex) {
 			assertTrue("Unexpected error message:\n" + ex.getMessage(),
 					ex.getMessage().startsWith(
-							"CookieValueMethodArgumentResolver doesn't support reactive type wrapper"));
+							"CookieValueMethodArgumentResolver does not support reactive type wrapper"));
 		}
 	}