Polishing

Author: jhoeller

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java

@@ -83,9 +83,17 @@ public abstract class AbstractMethodMessageHandler<T>
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private final List<HandlerMethodArgumentResolver> customArgumentResolvers = new ArrayList<HandlerMethodArgumentResolver>(4);
+	private final List<HandlerMethodArgumentResolver> customArgumentResolvers =
+			new ArrayList<HandlerMethodArgumentResolver>(4);
 
-	private final List<HandlerMethodReturnValueHandler> customReturnValueHandlers = new ArrayList<HandlerMethodReturnValueHandler>(4);
+	private final List<HandlerMethodReturnValueHandler> customReturnValueHandlers =
+			new ArrayList<HandlerMethodReturnValueHandler>(4);
+
+	private final HandlerMethodArgumentResolverComposite argumentResolvers =
+			new HandlerMethodArgumentResolverComposite();
+
+	private final HandlerMethodReturnValueHandlerComposite returnValueHandlers =
+			new HandlerMethodReturnValueHandlerComposite();
 
 	private final Map<T, HandlerMethod> handlerMethods = new LinkedHashMap<T, HandlerMethod>();
 
@@ -99,10 +107,6 @@ public abstract class AbstractMethodMessageHandler<T>
 
 	private Collection<String> destinationPrefixes = new ArrayList<String>();
 
-	private HandlerMethodArgumentResolverComposite argumentResolvers = new HandlerMethodArgumentResolverComposite();
-
-	private HandlerMethodReturnValueHandlerComposite returnValueHandlers =new HandlerMethodReturnValueHandlerComposite();
-
 	private ApplicationContext applicationContext;
 
 	/**
@@ -140,7 +144,6 @@ public List<HandlerMethodArgumentResolver> getCustomArgumentResolvers() {
 	/**
 	 * Sets the list of custom {@code HandlerMethodArgumentResolver}s that will be used
 	 * after resolvers for supported argument type.
-	 * @param customArgumentResolvers the list of resolvers; never {@code null}.
 	 */
 	public void setCustomArgumentResolvers(List<HandlerMethodArgumentResolver> customArgumentResolvers) {
 		this.customArgumentResolvers.clear();
@@ -159,7 +162,6 @@ public List<HandlerMethodReturnValueHandler> getCustomReturnValueHandlers() {
 	/**
 	 * Set the list of custom {@code HandlerMethodReturnValueHandler}s that will be used
 	 * after return value handlers for known types.
-	 * @param customReturnValueHandlers the list of custom return value handlers, never {@code null}.
 	 */
 	public void setCustomReturnValueHandlers(List<HandlerMethodReturnValueHandler> customReturnValueHandlers) {
 		this.customReturnValueHandlers.clear();
@@ -168,13 +170,16 @@ public void setCustomReturnValueHandlers(List<HandlerMethodReturnValueHandler> c
 		}
 	}
 
+	/**
+	 * Return the complete list of argument resolvers.
+	 */
 	public List<HandlerMethodArgumentResolver> getArgumentResolvers() {
 		return this.argumentResolvers.getResolvers();
 	}
 
 	/**
-	 * Configure the complete list of supported argument types effectively overriding
-	 * the ones configured by default. This is an advanced option. For most use cases
+	 * Configure the complete list of supported argument types, effectively overriding
+	 * the ones configured by default. This is an advanced option; for most use cases
 	 * it should be sufficient to use {@link #setCustomArgumentResolvers}.
 	 */
 	public void setArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
@@ -185,13 +190,16 @@ public void setArgumentResolvers(List<HandlerMethodArgumentResolver> argumentRes
 		this.argumentResolvers.addResolvers(argumentResolvers);
 	}
 
+	/**
+	 * Return the complete list of return value handlers.
+	 */
 	public List<HandlerMethodReturnValueHandler> getReturnValueHandlers() {
 		return this.returnValueHandlers.getReturnValueHandlers();
 	}
 
 	/**
-	 * Configure the complete list of supported return value types effectively overriding
-	 * the ones configured by default. This is an advanced option. For most use cases
+	 * Configure the complete list of supported return value types, effectively overriding
+	 * the ones configured by default. This is an advanced option; for most use cases
 	 * it should be sufficient to use {@link #setCustomReturnValueHandlers}.
 	 */
 	public void setReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnValueHandlers) {
@@ -202,13 +210,6 @@ public void setReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnV
 		this.returnValueHandlers.addHandlers(returnValueHandlers);
 	}
 
-	/**
-	 * Return a map with all handler methods and their mappings.
-	 */
-	public Map<T, HandlerMethod> getHandlerMethods() {
-		return Collections.unmodifiableMap(this.handlerMethods);
-	}
-
 	public ApplicationContext getApplicationContext() {
 		return this.applicationContext;
 	}
@@ -360,10 +361,19 @@ protected HandlerMethod createHandlerMethod(Object handler, Method method) {
 	 * (e.g. to support "global" {@code @MessageExceptionHandler}).
 	 * @since 4.2
 	 */
-	protected void registerExceptionHandlerAdvice(MessagingAdviceBean bean, AbstractExceptionHandlerMethodResolver resolver) {
+	protected void registerExceptionHandlerAdvice(
+			MessagingAdviceBean bean, AbstractExceptionHandlerMethodResolver resolver) {
+
 		this.exceptionHandlerAdviceCache.put(bean, resolver);
 	}
 
+	/**
+	 * Return a map with all handler methods and their mappings.
+	 */
+	public Map<T, HandlerMethod> getHandlerMethods() {
+		return Collections.unmodifiableMap(this.handlerMethods);
+	}
+
 
 	@Override
 	public void handleMessage(Message<?> message) throws MessagingException {
@@ -425,7 +435,7 @@ protected void handleMessageInternal(Message<?> message, String lookupDestinatio
 			addMatchesToCollection(allMappings, message, matches);
 		}
 		if (matches.isEmpty()) {
-			handleNoMatch(handlerMethods.keySet(), lookupDestination, message);
+			handleNoMatch(this.handlerMethods.keySet(), lookupDestination, message);
 			return;
 		}
 		Comparator<Match> comparator = new MatchComparator(getMappingComparator(message));
@@ -449,7 +459,6 @@ protected void handleMessageInternal(Message<?> message, String lookupDestinatio
 		handleMatch(bestMatch.mapping, bestMatch.handlerMethod, lookupDestination, message);
 	}
 
-
 	private void addMatchesToCollection(Collection<T> mappingsToCheck, Message<?> message, List<Match> matches) {
 		for (T mapping : mappingsToCheck) {
 			T match = getMatchingMapping(mapping, message);
@@ -468,7 +477,6 @@ private void addMatchesToCollection(Collection<T> mappingsToCheck, Message<?> me
 	 */
 	protected abstract T getMatchingMapping(T mapping, Message<?> message);
 
-
 	protected void handleNoMatch(Set<T> ts, String lookupDestination, Message<?> message) {
 		logger.debug("No matching message handler methods.");
 	}
@@ -481,7 +489,6 @@ protected void handleNoMatch(Set<T> ts, String lookupDestination, Message<?> mes
 	 */
 	protected abstract Comparator<T> getMappingComparator(Message<?> message);
 
-
 	protected void handleMatch(T mapping, HandlerMethod handlerMethod, String lookupDestination, Message<?> message) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Invoking " + handlerMethod.getShortLogMessage());
@@ -579,6 +586,7 @@ protected InvocableHandlerMethod getExceptionHandlerMethod(HandlerMethod handler
 	protected abstract AbstractExceptionHandlerMethodResolver createExceptionHandlerMethodResolverFor(
 			Class<?> beanType);
 
+
 	@Override
 	public String toString() {
 		return getClass().getSimpleName() + "[prefixes=" + getDestinationPrefixes() + "]";

spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java

@@ -427,8 +427,7 @@ private void ports(UriComponents uriComponents, MockHttpServletRequest request)
 
 	private UriComponents uriComponents() {
 		URL url = this.webRequest.getUrl();
-		UriComponentsBuilder uriBldr = UriComponentsBuilder.fromUriString(url.toExternalForm());
-		return uriBldr.build();
+		return UriComponentsBuilder.fromUriString(url.toExternalForm()).build();
 	}
 
 	@Override
@@ -455,13 +454,14 @@ private CookieManager getCookieManager() {
 		return this.webClient.getCookieManager();
 	}
 
+
 	/**
-	 * An extension to {@link MockHttpServletRequest} that ensures that
-	 * when a new {@link HttpSession} is created, it is added to the managed sessions.
+	 * An extension to {@link MockHttpServletRequest} that ensures that when a
+	 * new {@link HttpSession} is created, it is added to the managed sessions.
 	 */
 	private final class HtmlUnitMockHttpServletRequest extends MockHttpServletRequest {
 
-		private HtmlUnitMockHttpServletRequest(ServletContext servletContext, String method, String requestURI) {
+		public HtmlUnitMockHttpServletRequest(ServletContext servletContext, String method, String requestURI) {
 			super(servletContext, method, requestURI);
 		}
 
@@ -490,16 +490,17 @@ public void setSession(HttpSession session) {
 		}
 	}
 
+
 	/**
 	 * An extension to {@link MockHttpSession} that ensures when
-	 * {@link #invalidate()} is called that the {@link HttpSession} is
-	 * removed from the managed sessions.
+	 * {@link #invalidate()} is called that the {@link HttpSession}
+	 * is removed from the managed sessions.
 	 */
 	private final class HtmlUnitMockHttpSession extends MockHttpSession {
 
 		private final MockHttpServletRequest request;
 
-		private HtmlUnitMockHttpSession(MockHttpServletRequest request) {
+		public HtmlUnitMockHttpSession(MockHttpServletRequest request) {
 			super(request.getServletContext());
 			this.request = request;
 		}