diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java index 3b996ddb3b..ed7ea99fef 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java @@ -239,6 +239,7 @@ public class EnableAsyncTests { @Configuration @EnableAsync(mode = AdviceMode.ASPECTJ) static class AspectJAsyncAnnotationConfig { + @Bean public AsyncBean asyncBean() { return new AsyncBean(); @@ -276,7 +277,7 @@ public class EnableAsyncTests { @Override public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { - return exceptionHandler(); + return exceptionHandler(); } @Bean diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java index 3d283f4158..0f18a56718 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java @@ -144,6 +144,7 @@ public class SendToMethodReturnValueHandler implements HandlerMethodReturnValueH if (returnValue == null) { return; } + MessageHeaders headers = message.getHeaders(); String sessionId = SimpMessageHeaderAccessor.getSessionId(headers); PlaceholderResolver varResolver = initVarResolver(headers); diff --git a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java index fcb8c712a5..a7114e46c1 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java @@ -17,12 +17,10 @@ package org.springframework.web.context.request; import java.security.Principal; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.Iterator; import java.util.Locale; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -40,7 +38,6 @@ import org.springframework.web.util.WebUtils; * @author Juergen Hoeller * @author Brian Clozel * @author Markus Malkusch - * * @since 2.0 */ public class ServletWebRequest extends ServletRequestAttributes implements NativeWebRequest { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java index 1fc03aa27c..b0e087414b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java @@ -100,13 +100,13 @@ import org.springframework.web.util.WebUtils; /** * An {@link AbstractHandlerMethodAdapter} that supports {@link HandlerMethod}s - * with the signature -- method argument and return types, defined in + * with their method argument and return type signature, as defined via * {@code @RequestMapping}. * *
Support for custom argument and return value types can be added via * {@link #setCustomArgumentResolvers} and {@link #setCustomReturnValueHandlers}. - * Or alternatively to re-configure all argument and return value types use - * {@link #setArgumentResolvers} and {@link #setReturnValueHandlers(List)}. + * Or alternatively, to re-configure all argument and return value types, + * use {@link #setArgumentResolvers} and {@link #setReturnValueHandlers}. * * @author Rossen Stoyanchev * @author Juergen Hoeller diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java index a5252faffc..2deead181c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java @@ -133,6 +133,7 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi super.afterPropertiesSet(); } + /** * Whether to use suffix pattern matching. */