Supported for annotated handler methods in Servlet and Portlet environments. + *
Supported for annotated handler methods in Spring MVC and Spring WebFlux. * *
If the method parameter is {@link java.util.Map Map<String, String>}, * {@link org.springframework.util.MultiValueMap MultiValueMap<String, String>}, diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java index 3287a3258c..71fae85359 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -29,7 +29,17 @@ import org.springframework.core.annotation.AliasFor; * Annotation which indicates that a method parameter should be bound to a web * request parameter. * - *
Supported for annotated handler methods in Servlet and Portlet environments. + *
Supported for annotated handler methods in Spring MVC and Spring WebFlux + * as follows: + *
If the method parameter type is {@link Map} and a request parameter name * is specified, then the request parameter value is converted to a {@link Map} diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java index 849c2be6dc..4973a4874c 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java +++ b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java @@ -22,8 +22,7 @@ import org.springframework.web.context.request.WebRequest; /** * Default implementation of the {@link SessionAttributeStore} interface, - * storing the attributes in the WebRequest session (i.e. HttpSession - * or PortletSession). + * storing the attributes in the WebRequest session (i.e. HttpSession). * * @author Juergen Hoeller * @since 2.5 diff --git a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java index 1ce6bb76f5..9da76e8b64 100644 --- a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java +++ b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java @@ -79,8 +79,8 @@ public interface WebApplicationContext extends ApplicationContext { String SERVLET_CONTEXT_BEAN_NAME = "servletContext"; /** - * Name of the ServletContext/PortletContext init-params environment bean in the factory. - *
Note: Possibly merged with ServletConfig/PortletConfig parameters. + * Name of the ServletContext init-params environment bean in the factory. + *
Note: Possibly merged with ServletConfig parameters. * ServletConfig parameters override ServletContext parameters of the same name. * @see javax.servlet.ServletContext#getInitParameterNames() * @see javax.servlet.ServletContext#getInitParameter(String) @@ -90,7 +90,7 @@ public interface WebApplicationContext extends ApplicationContext { String CONTEXT_PARAMETERS_BEAN_NAME = "contextParameters"; /** - * Name of the ServletContext/PortletContext attributes environment bean in the factory. + * Name of the ServletContext attributes environment bean in the factory. * @see javax.servlet.ServletContext#getAttributeNames() * @see javax.servlet.ServletContext#getAttribute(String) */ diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java index 2c6925d4f9..e26df698b6 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java @@ -191,7 +191,7 @@ public class FacesRequestAttributes implements RequestAttributes { public String getSessionId() { Object session = getExternalContext().getSession(true); try { - // Both HttpSession and PortletSession have a getId() method. + // HttpSession has a getId() method. Method getIdMethod = session.getClass().getMethod("getId"); return String.valueOf(ReflectionUtils.invokeMethod(getIdMethod, session)); } diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java index fea0e922d4..f1eb668e0c 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java @@ -40,7 +40,7 @@ public interface RequestAttributes { /** * Constant that indicates session scope. *
This preferably refers to a locally isolated session, if such - * a distinction is available (for example, in a Portlet environment). + * a distinction is available. * Else, it simply refers to the common session. */ int SCOPE_SESSION = 1; @@ -120,8 +120,8 @@ public interface RequestAttributes { /** * Resolve the contextual reference for the given key, if any. - *
At a minimum: the HttpServletRequest/PortletRequest reference for key - * "request", and the HttpSession/PortletSession reference for key "session". + *
At a minimum: the HttpServletRequest reference for key "request", and + * the HttpSession reference for key "session". * @param key the contextual key * @return the corresponding object, or {@code null} if none found */ diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java index 0134e6f7ff..34c577b184 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java @@ -132,7 +132,7 @@ public abstract class RequestContextHolder { "Are you referring to request attributes outside of an actual web request, " + "or processing a request outside of the originally receiving thread? " + "If you are actually operating within a web request and still receive this message, " + - "your code is probably running outside of DispatcherServlet/DispatcherPortlet: " + + "your code is probably running outside of DispatcherServlet: " + "In this case, use RequestContextListener or RequestContextFilter to expose the current request."); } } diff --git a/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java b/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java index aee6209a4e..6f5e2ced5e 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java @@ -21,8 +21,7 @@ import org.springframework.ui.ModelMap; /** * Interface for general web request interception. Allows for being applied - * to Servlet request as well as Portlet request environments, by building - * on the {@link WebRequest} abstraction. + * to Servlet request by building on the {@link WebRequest} abstraction. * *
This interface assumes MVC-style request processing: A handler gets executed, * exposes a set of model objects, then a view gets rendered based on that model. @@ -40,13 +39,6 @@ import org.springframework.ui.ModelMap; *
This interface is deliberately minimalistic to keep the dependencies of * generic request interceptors as minimal as feasible. * - *
NOTE: While this interceptor is applied to the entire request processing - * in a Servlet environment, it is by default only applied to the render phase - * in a Portlet environment, preparing and rendering a Portlet view. To apply - * WebRequestInterceptors to the action phase as well, set the HandlerMapping's - * "applyWebRequestInterceptorsToRenderPhaseOnly" flag to "false". Alternatively, - * consider using the Portlet-specific HandlerInterceptor mechanism for such needs. - * * @author Juergen Hoeller * @since 2.0 * @see ServletWebRequest diff --git a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java index 9395ceee65..258626c57e 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java @@ -215,7 +215,7 @@ public abstract class WebApplicationContextUtils { * with the given BeanFactory, as used by the WebApplicationContext. * @param bf the BeanFactory to configure * @param servletContext the ServletContext that we're running within - * @param servletConfig the ServletConfig of the containing Portlet + * @param servletConfig the ServletConfig */ public static void registerEnvironmentBeans(ConfigurableListableBeanFactory bf, @Nullable ServletContext servletContext, @Nullable ServletConfig servletConfig) {