diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java index 6c1f68bd333..ea723d23643 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java @@ -41,6 +41,7 @@ public class MissingServletRequestParameterException extends ServletRequestBindi } + @Override public String getMessage() { return "Required " + this.parameterType + " parameter '" + this.parameterName + "' is not present"; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/RequestUtils.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/RequestUtils.java index a76ee8abde1..94e5e631e1e 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/RequestUtils.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/RequestUtils.java @@ -34,6 +34,7 @@ import org.springframework.web.HttpRequestMethodNotSupportedException; * @deprecated as of Spring 2.0: use ServletRequestUtils instead * @see ServletRequestUtils */ +@Deprecated public abstract class RequestUtils { /** diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/ServletRequestUtils.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/ServletRequestUtils.java index b6e8be351eb..73c258b232b 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/ServletRequestUtils.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/ServletRequestUtils.java @@ -546,10 +546,12 @@ public abstract class ServletRequestUtils { private static class IntParser extends ParameterParser { + @Override protected String getType() { return "int"; } + @Override protected Object doParse(String s) throws NumberFormatException { return Integer.valueOf(s); } @@ -571,10 +573,12 @@ public abstract class ServletRequestUtils { private static class LongParser extends ParameterParser { + @Override protected String getType() { return "long"; } + @Override protected Object doParse(String parameter) throws NumberFormatException { return Long.valueOf(parameter); } @@ -596,10 +600,12 @@ public abstract class ServletRequestUtils { private static class FloatParser extends ParameterParser { + @Override protected String getType() { return "float"; } + @Override protected Object doParse(String parameter) throws NumberFormatException { return Float.valueOf(parameter); } @@ -621,10 +627,12 @@ public abstract class ServletRequestUtils { private static class DoubleParser extends ParameterParser { + @Override protected String getType() { return "double"; } + @Override protected Object doParse(String parameter) throws NumberFormatException { return Double.valueOf(parameter); } @@ -646,10 +654,12 @@ public abstract class ServletRequestUtils { private static class BooleanParser extends ParameterParser { + @Override protected String getType() { return "boolean"; } + @Override protected Object doParse(String parameter) throws NumberFormatException { return (parameter.equalsIgnoreCase("true") || parameter.equalsIgnoreCase("on") || parameter.equalsIgnoreCase("yes") || parameter.equals("1") ? Boolean.TRUE : Boolean.FALSE); @@ -672,10 +682,12 @@ public abstract class ServletRequestUtils { private static class StringParser extends ParameterParser { + @Override protected String getType() { return "string"; } + @Override protected Object doParse(String parameter) throws NumberFormatException { return parameter; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/WebDataBinder.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/WebDataBinder.java index bacf8227b71..7c8575c52de 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/WebDataBinder.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/bind/WebDataBinder.java @@ -144,6 +144,7 @@ public class WebDataBinder extends DataBinder { * before delegating to the superclass binding process. * @see #checkFieldMarkers */ + @Override protected void doBind(MutablePropertyValues mpvs) { checkFieldMarkers(mpvs); super.doBind(mpvs); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java index 918e30aece1..b5a850ef146 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java @@ -111,6 +111,7 @@ public class CommonsMultipartResolver extends CommonsFileUploadSupport * @param fileItemFactory the Commons FileItemFactory to use * @return the new ServletFileUpload instance */ + @Override protected FileUpload newFileUpload(FileItemFactory fileItemFactory) { return new ServletFileUpload(fileItemFactory); } @@ -138,6 +139,7 @@ public class CommonsMultipartResolver extends CommonsFileUploadSupport Assert.notNull(request, "Request must not be null"); if (this.resolveLazily) { return new DefaultMultipartHttpServletRequest(request) { + @Override protected void initializeMultipart() { MultipartParsingResult parsingResult = parseRequest(request); setMultipartFiles(parsingResult.getMultipartFiles()); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java index 2e92c39f398..9d6c09d92fd 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java @@ -30,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile; */ public class ByteArrayMultipartFileEditor extends ByteArrayPropertyEditor { + @Override public void setValue(Object value) { if (value instanceof MultipartFile) { MultipartFile multipartFile = (MultipartFile) value; @@ -50,6 +51,7 @@ public class ByteArrayMultipartFileEditor extends ByteArrayPropertyEditor { } } + @Override public String getAsText() { byte[] value = (byte[]) getValue(); return (value != null ? new String(value) : ""); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java index 8838914be2e..c242cff7f9d 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java @@ -64,6 +64,7 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer } + @Override public Enumeration getParameterNames() { Set paramNames = new HashSet(); Enumeration paramEnum = super.getParameterNames(); @@ -74,6 +75,7 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer return Collections.enumeration(paramNames); } + @Override public String getParameter(String name) { String[] values = (String[]) getMultipartParameters().get(name); if (values != null) { @@ -82,6 +84,7 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer return super.getParameter(name); } + @Override public String[] getParameterValues(String name) { String[] values = (String[]) getMultipartParameters().get(name); if (values != null) { @@ -90,6 +93,7 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer return super.getParameterValues(name); } + @Override public Map getParameterMap() { Map paramMap = new HashMap(); paramMap.putAll(super.getParameterMap()); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java index 349c83f8728..b5c770bf85d 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java @@ -88,6 +88,7 @@ public class MultipartFilter extends OncePerRequestFilter { * from proper parameter extraction in the multipart case, and are able to cast to * MultipartHttpServletRequest if they need to. */ + @Override protected void doFilterInternal( HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java index ac99c7fb858..585eb926936 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java @@ -52,10 +52,12 @@ public class StringMultipartFileEditor extends PropertyEditorSupport { } + @Override public void setAsText(String text) { setValue(text); } + @Override public void setValue(Object value) { if (value instanceof MultipartFile) { MultipartFile multipartFile = (MultipartFile) value; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java index 8e3e61356de..b662217f235 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java @@ -394,6 +394,7 @@ public class DispatcherServlet extends FrameworkServlet { /** * This implementation calls {@link #initStrategies}. */ + @Override protected void onRefresh(ApplicationContext context) throws BeansException { initStrategies(context); } @@ -775,6 +776,7 @@ public class DispatcherServlet extends FrameworkServlet { * Exposes the DispatcherServlet-specific request attributes and * delegates to {@link #doDispatch} for the actual dispatching. */ + @Override protected void doService(HttpServletRequest request, HttpServletResponse response) throws Exception { if (logger.isDebugEnabled()) { String requestUri = new UrlPathHelper().getRequestUri(request); @@ -949,6 +951,7 @@ public class DispatcherServlet extends FrameworkServlet { * Override HttpServlet's getLastModified method to evaluate * the Last-Modified value of the mapped handler. */ + @Override protected long getLastModified(HttpServletRequest request) { if (logger.isDebugEnabled()) { String requestUri = new UrlPathHelper().getRequestUri(request); @@ -992,6 +995,7 @@ public class DispatcherServlet extends FrameworkServlet { public Locale getLocale() { return localeResolver.resolveLocale(request); } + @Override public String toString() { return getLocale().toString(); } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FrameworkServlet.java index dc323d87f2d..7e9f716f3a4 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FrameworkServlet.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FrameworkServlet.java @@ -271,6 +271,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic * Overridden method of {@link HttpServletBean}, invoked after any bean properties * have been set. Creates this servlet's WebApplicationContext. */ + @Override protected final void initServletBean() throws ServletException, BeansException { getServletContext().log("Initializing Spring FrameworkServlet '" + getServletName() + "'"); if (this.logger.isInfoEnabled()) { @@ -495,6 +496,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic * @see #doService * @see #doHead */ + @Override protected final void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -505,6 +507,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic * Delegate POST requests to {@link #processRequest}. * @see #doService */ + @Override protected final void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -515,6 +518,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic * Delegate PUT requests to {@link #processRequest}. * @see #doService */ + @Override protected final void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -525,6 +529,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic * Delegate DELETE requests to {@link #processRequest}. * @see #doService */ + @Override protected final void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -536,6 +541,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic *

Applies HttpServlet's standard OPTIONS processing first. * @see #doService */ + @Override protected void doOptions(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doOptions(request, response); if (this.dispatchOptionsRequest) { @@ -548,6 +554,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic *

Applies HttpServlet's standard TRACE processing first. * @see #doService */ + @Override protected void doTrace(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doTrace(request, response); if (this.dispatchTraceRequest) { @@ -637,6 +644,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic * Close the WebApplicationContext of this servlet. * @see org.springframework.context.ConfigurableApplicationContext#close() */ + @Override public void destroy() { getServletContext().log("Destroying Spring FrameworkServlet '" + getServletName() + "'"); if (this.webApplicationContext instanceof ConfigurableApplicationContext) { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java index 98f3cdbfb25..10dc3be9d7a 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java @@ -116,6 +116,7 @@ public class HandlerExecutionChain { /** * Delegates to the handler's toString(). */ + @Override public String toString() { return String.valueOf(handler); } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HttpServletBean.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HttpServletBean.java index 3d650438023..03099e4e38c 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HttpServletBean.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/HttpServletBean.java @@ -103,6 +103,7 @@ public abstract class HttpServletBean extends HttpServlet { * @throws ServletException if bean properties are invalid (or required * properties are missing), or if subclass initialization fails. */ + @Override public final void init() throws ServletException { if (logger.isDebugEnabled()) { logger.debug("Initializing servlet '" + getServletName() + "'"); @@ -147,6 +148,7 @@ public abstract class HttpServletBean extends HttpServlet { * ServletConfig set yet. * @see #getServletConfig() */ + @Override public final String getServletName() { return (getServletConfig() != null ? getServletConfig().getServletName() : null); } @@ -156,6 +158,7 @@ public abstract class HttpServletBean extends HttpServlet { * ServletConfig set yet. * @see #getServletConfig() */ + @Override public final ServletContext getServletContext() { return (getServletConfig() != null ? getServletConfig().getServletContext() : null); } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ModelAndView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ModelAndView.java index fa0a5745bff..9eadea7002f 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ModelAndView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ModelAndView.java @@ -289,6 +289,7 @@ public class ModelAndView { /** * Return diagnostic information about this model and view. */ + @Override public String toString() { StringBuffer buf = new StringBuffer("ModelAndView: "); if (isReference()) { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ResourceServlet.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ResourceServlet.java index 54e5a957a83..3f40bbd08c6 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ResourceServlet.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ResourceServlet.java @@ -168,6 +168,7 @@ public class ResourceServlet extends HttpServletBean { /** * Remember the startup time, using no last-modified time before it. */ + @Override protected void initServletBean() { this.pathMatcher = getPathMatcher(); this.startupTime = System.currentTimeMillis(); @@ -188,6 +189,7 @@ public class ResourceServlet extends HttpServletBean { * Determine the URL of the target resource and include it. * @see #determineResourceUrl */ + @Override protected final void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -297,6 +299,7 @@ public class ResourceServlet extends HttpServletBean { * @see #determineResourceUrl * @see #getFileTimestamp */ + @Override protected final long getLastModified(HttpServletRequest request) { if (this.applyLastModified) { String resourceUrl = determineResourceUrl(request); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java index 0c59f328a6d..89fab03fdcb 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java @@ -59,12 +59,14 @@ public class ViewRendererServlet extends HttpServlet { public static final String MODEL_ATTRIBUTE = ViewRendererServlet.class.getName() + ".MODEL"; + @Override protected final void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { processRequest(request, response); } + @Override protected final void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java index 10b99b7edbe..a3973682aae 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java @@ -52,6 +52,7 @@ public abstract class AbstractDetectingUrlHandlerMapping extends AbstractUrlHand * Calls the {@link #detectHandlers()} method in addition to the * superclass's initialization. */ + @Override public void initApplicationContext() throws ApplicationContextException { super.initApplicationContext(); detectHandlers(); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java index f53d4da9c87..171a227715a 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java @@ -105,6 +105,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport * @see #extendInterceptors(java.util.List) * @see #initInterceptors() */ + @Override protected void initApplicationContext() throws BeansException { extendInterceptors(this.interceptors); initInterceptors(); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java index 0c6e0fda7e8..b594b856f61 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java @@ -154,6 +154,7 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping { * @param request current HTTP request * @return the handler instance, or null if none found */ + @Override protected Object getHandlerInternal(HttpServletRequest request) throws Exception { String lookupPath = this.urlPathHelper.getLookupPathForRequest(request); Object handler = lookupHandler(lookupPath, request); @@ -353,6 +354,7 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping { this.pathWithinMapping = pathWithinMapping; } + @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { exposePathWithinMapping(this.pathWithinMapping, request); return true; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMapping.java index 388a9c54b2f..1aed150e6dd 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMapping.java @@ -53,6 +53,7 @@ public class BeanNameUrlHandlerMapping extends AbstractDetectingUrlHandlerMappin /** * Checks name and aliases of the given bean for URLs, starting with "/". */ + @Override protected String[] determineUrlsForHandler(String beanName) { List urls = new ArrayList(); if (beanName.startsWith("/")) { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java index 920fcc36260..0364a3bf903 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java @@ -44,6 +44,7 @@ public class DispatcherServletWebRequest extends ServletWebRequest { super(request); } + @Override public Locale getLocale() { return RequestContextUtils.getLocale(getRequest()); } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java index e6a5c6619f1..a6f02eef94e 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java @@ -98,6 +98,7 @@ public class SimpleUrlHandlerMapping extends AbstractUrlHandlerMapping { * Calls the {@link #registerHandlers} method in addition to the * superclass's initialization. */ + @Override public void initApplicationContext() throws BeansException { super.initApplicationContext(); registerHandlers(this.urlMap); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java index 1144b368b1e..c1309bf9390 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java @@ -44,6 +44,7 @@ public class UserRoleAuthorizationInterceptor extends HandlerInterceptorAdapter } + @Override public final boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/AbstractPathMapHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/AbstractPathMapHandlerMapping.java index 25fed95c6f5..03a885a4c55 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/AbstractPathMapHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/AbstractPathMapHandlerMapping.java @@ -48,6 +48,7 @@ import org.springframework.web.servlet.handler.AbstractUrlHandlerMapping; * @deprecated as of Spring 2.5, in favor of annotation-based request mapping. * To be removed in Spring 3.0. */ +@Deprecated public abstract class AbstractPathMapHandlerMapping extends AbstractUrlHandlerMapping { /** Constants instance for AutowireCapableBeanFactory */ @@ -104,6 +105,7 @@ public abstract class AbstractPathMapHandlerMapping extends AbstractUrlHandlerMa * to the superclass's initialization. * @see #detectAndCreateHandlers */ + @Override public void initApplicationContext() throws BeansException { super.initApplicationContext(); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/CommonsPathMapHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/CommonsPathMapHandlerMapping.java index bcefb9a56a2..0e3c1c4d805 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/CommonsPathMapHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/CommonsPathMapHandlerMapping.java @@ -55,6 +55,7 @@ import org.apache.commons.attributes.Attributes; * @deprecated as of Spring 2.5, in favor of annotation-based request mapping. * To be removed in Spring 3.0. */ +@Deprecated public class CommonsPathMapHandlerMapping extends AbstractPathMapHandlerMapping { /** @@ -62,6 +63,7 @@ public class CommonsPathMapHandlerMapping extends AbstractPathMapHandlerMapping * objects with the required PathMap attribute. Protected so that it can * be overridden during testing. */ + @Override protected Class[] getClassesWithPathMapAttributes() throws Exception { AttributeIndex ai = new AttributeIndex(getClass().getClassLoader()); Collection classes = ai.getClasses(PathMap.class); @@ -73,6 +75,7 @@ public class CommonsPathMapHandlerMapping extends AbstractPathMapHandlerMapping * We know there's at least one, as the getClassNamesWithPathMapAttributes * method return this class name. */ + @Override protected PathMap[] getPathMapAttributes(Class handlerClass) { Collection atts = Attributes.getAttributes(handlerClass, PathMap.class); return (PathMap[]) atts.toArray(new PathMap[atts.size()]); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/PathMap.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/PathMap.java index f838094843c..293233fa52b 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/PathMap.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/metadata/PathMap.java @@ -30,6 +30,7 @@ package org.springframework.web.servlet.handler.metadata; * To be removed in Spring 3.0. * @@org.apache.commons.attributes.Indexed() */ +@Deprecated public class PathMap { /* diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java index 0e0ee586dfb..d6b9a90e716 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java @@ -62,6 +62,7 @@ public class LocaleChangeInterceptor extends HandlerInterceptorAdapter { } + @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java index d0545af6603..f3e50c11a54 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java @@ -75,6 +75,7 @@ public abstract class AbstractCommandController extends BaseCommandController { } + @Override protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java index 3426b181360..832de175d8d 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java @@ -252,6 +252,7 @@ public abstract class AbstractFormController extends BaseCommandController { * @see #showNewForm * @see #processFormSubmission */ + @Override protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -425,6 +426,7 @@ public abstract class AbstractFormController extends BaseCommandController { * @throws Exception in case of invalid state or arguments * @see #formBackingObject */ + @Override protected final Object getCommand(HttpServletRequest request) throws Exception { // If not in session-form mode, create a new form-backing object. if (!isSessionForm()) { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java index fec8666a644..746a9b1bc40 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java @@ -88,6 +88,7 @@ public abstract class AbstractUrlViewController extends AbstractController { * Retrieves the URL path to use for lookup and delegates to * {@link #getViewNameForRequest}. */ + @Override protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) { String lookupPath = getUrlPathHelper().getLookupPathForRequest(request); String viewName = getViewNameForRequest(request); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java index 7f40415904d..3cae3a06a6c 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java @@ -222,6 +222,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle /** * Calls page-specific onBindAndValidate method. */ + @Override protected final void onBindAndValidate(HttpServletRequest request, Object command, BindException errors) throws Exception { @@ -253,6 +254,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle * @see #isFinishRequest(javax.servlet.http.HttpServletRequest) * @see #isCancelRequest(javax.servlet.http.HttpServletRequest) */ + @Override protected boolean isFormSubmission(HttpServletRequest request) { return super.isFormSubmission(request) || isFinishRequest(request) || isCancelRequest(request); } @@ -260,6 +262,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle /** * Calls page-specific referenceData method. */ + @Override protected final Map referenceData(HttpServletRequest request, Object command, Errors errors) throws Exception { @@ -307,6 +310,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle *

This can be overridden in subclasses, e.g. to prepare wizard-specific * error views in case of an Exception. */ + @Override protected ModelAndView showForm( HttpServletRequest request, HttpServletResponse response, BindException errors) throws Exception { @@ -451,6 +455,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle * @see #showNewForm * @see #setBindOnNewForm */ + @Override protected ModelAndView handleInvalidSubmit(HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -461,6 +466,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle /** * Apply wizard workflow: finish, cancel, page change. */ + @Override protected final ModelAndView processFormSubmission( HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws Exception { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java index b7e7f44f4ab..f4963ae2fca 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java @@ -319,6 +319,7 @@ public abstract class BaseCommandController extends AbstractController { } + @Override protected void initApplicationContext() { if (this.validators != null) { for (int i = 0; i < this.validators.length; i++) { @@ -567,6 +568,7 @@ public abstract class BaseCommandController extends AbstractController { * @deprecated as of Spring 2.0.4, in favor of the * {@link #suppressValidation(HttpServletRequest, Object)} variant */ + @Deprecated protected boolean suppressValidation(HttpServletRequest request) { return false; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java index b0bba252d8d..d5be516c864 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java @@ -108,6 +108,7 @@ public class CancellableFormController extends SimpleFormController { * Consider an explicit cancel request as a form submission too. * @see #isCancelRequest(javax.servlet.http.HttpServletRequest) */ + @Override protected boolean isFormSubmission(HttpServletRequest request) { return super.isFormSubmission(request) || isCancelRequest(request); } @@ -116,6 +117,7 @@ public class CancellableFormController extends SimpleFormController { * Suppress validation for an explicit cancel request too. * @see #isCancelRequest(javax.servlet.http.HttpServletRequest) */ + @Override protected boolean suppressValidation(HttpServletRequest request, Object command) { return super.suppressValidation(request, command) || isCancelRequest(request); } @@ -129,6 +131,7 @@ public class CancellableFormController extends SimpleFormController { * @see #onCancel(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, Object) * @see SimpleFormController#processFormSubmission */ + @Override protected ModelAndView processFormSubmission( HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws Exception { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java index b571b8f57a4..3ab6a819f55 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java @@ -84,6 +84,7 @@ public class ParameterizableViewController extends AbstractController { return this.viewName; } + @Override protected void initApplicationContext() { if (this.viewName == null) { throw new IllegalArgumentException("Property 'viewName' is required"); @@ -95,6 +96,7 @@ public class ParameterizableViewController extends AbstractController { * Return a ModelAndView object with the specified view name. * @see #getViewName() */ + @Override protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java index d1dc8b7e3e1..3ddaa4fb694 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java @@ -109,6 +109,7 @@ public class ServletForwardingController extends AbstractController implements B } + @Override protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java index 7d94e9f0490..fc97927078e 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java @@ -152,6 +152,7 @@ public class ServletWrappingController extends AbstractController * Invoke the the wrapped Servlet instance. * @see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse) */ + @Override protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java index b512b1fcb2f..aab02005a04 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java @@ -168,6 +168,7 @@ public class SimpleFormController extends AbstractFormController { * @see #setFormView * @see #showForm(HttpServletRequest, HttpServletResponse, BindException, Map) */ + @Override protected ModelAndView showForm( HttpServletRequest request, HttpServletResponse response, BindException errors) throws Exception { @@ -210,6 +211,7 @@ public class SimpleFormController extends AbstractFormController { * @throws Exception in case of invalid state or arguments * @see ModelAndView */ + @Override protected Map referenceData(HttpServletRequest request, Object command, Errors errors) throws Exception { return referenceData(request); } @@ -247,6 +249,7 @@ public class SimpleFormController extends AbstractFormController { * @see #onSubmit(Object) * @see #doSubmitAction(Object) */ + @Override protected ModelAndView processFormSubmission( HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws Exception { @@ -274,6 +277,7 @@ public class SimpleFormController extends AbstractFormController { * validated but just show the new form. * @see #isFormChangeRequest */ + @Override protected boolean suppressValidation(HttpServletRequest request, Object command) { return isFormChangeRequest(request, command); } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java index ae569c2ff47..b7abc02dc43 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java @@ -96,6 +96,7 @@ public class UrlFilenameViewController extends AbstractUrlViewController { * @see #setPrefix * @see #setSuffix */ + @Override protected String getViewNameForRequest(HttpServletRequest request) { String uri = extractOperableUrl(request); return getViewNameForUrlPath(uri); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java index 2867a72d879..8bbc32d2088 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java @@ -666,12 +666,14 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen public String[] params = new String[0]; + @Override public boolean equals(Object obj) { RequestMappingInfo other = (RequestMappingInfo) obj; return (Arrays.equals(this.paths, other.paths) && Arrays.equals(this.methods, other.methods) && Arrays.equals(this.params, other.params)); } + @Override public int hashCode() { return (Arrays.hashCode(this.paths) * 29 + Arrays.hashCode(this.methods) * 31 + Arrays.hashCode(this.params)); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java index a4d400d9636..3dbaf590cb5 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java @@ -105,6 +105,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractDetectingUrlHandler * Checks for presence of the {@link org.springframework.web.bind.annotation.RequestMapping} * annotation on the handler class and on any of its methods. */ + @Override protected String[] determineUrlsForHandler(String beanName) { ApplicationContext context = getApplicationContext(); Class handlerType = context.getType(beanName); @@ -177,6 +178,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractDetectingUrlHandler * Validate the given annotated handler against the current request. * @see #validateMapping */ + @Override protected void validateHandler(Object handler, HttpServletRequest request) throws Exception { RequestMapping mapping = this.cachedMappings.get(handler.getClass()); if (mapping == null) { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java index 89ee80de074..e345a148b94 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java @@ -84,6 +84,7 @@ public class InternalPathMethodNameResolver extends AbstractUrlMethodNameResolve * @see #extractHandlerMethodNameFromUrlPath * @see #postProcessHandlerMethodName */ + @Override protected String getHandlerMethodNameForUrlPath(String urlPath) { String methodName = (String) this.methodNameCache.get(urlPath); if (methodName == null) { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java index ac3e42e7042..85e600f297e 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java @@ -403,6 +403,7 @@ public class MultiActionController extends AbstractController implements LastMod * @see #invokeNamedMethod * @see #handleNoSuchRequestHandlingMethod */ + @Override protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception { try { @@ -601,6 +602,7 @@ public class MultiActionController extends AbstractController implements LastMod * @deprecated as of Spring 2.0: * use initBinder(HttpServletRequest, ServletRequestDataBinder) instead */ + @Deprecated protected void initBinder(ServletRequest request, ServletRequestDataBinder binder) throws Exception { } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java index fc3c1249bfc..09831f00e9b 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java @@ -79,6 +79,7 @@ public class PropertiesMethodNameResolver extends AbstractUrlMethodNameResolver } + @Override protected String getHandlerMethodNameForUrlPath(String urlPath) { String methodName = this.mappings.getProperty(urlPath); if (methodName != null) { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java index 937cb35f8aa..153616d4af6 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java @@ -106,6 +106,7 @@ public abstract class AbstractControllerUrlHandlerMapping extends AbstractDetect * This implementation delegates to {@link #buildUrlsForHandler}, * provided that {@link #isEligibleForMapping} returns true. */ + @Override protected String[] determineUrlsForHandler(String beanName) { Class beanClass = getApplicationContext().getType(beanName); if (isEligibleForMapping(beanName, beanClass)) { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java index 3d6c7bc1e60..7be0a9e65f9 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java @@ -28,11 +28,13 @@ import org.springframework.stereotype.Controller; */ class AnnotationControllerTypePredicate extends ControllerTypePredicate { + @Override public boolean isControllerType(Class beanClass) { return (super.isControllerType(beanClass) || AnnotationUtils.findAnnotation(beanClass, Controller.class) != null); } + @Override public boolean isMultiActionControllerType(Class beanClass) { return (super.isMultiActionControllerType(beanClass) || AnnotationUtils.findAnnotation(beanClass, Controller.class) != null); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java index 7c5ae10de47..0a935fce627 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java @@ -65,6 +65,7 @@ public class ControllerBeanNameHandlerMapping extends AbstractControllerUrlHandl } + @Override protected String[] buildUrlsForHandler(String beanName, Class beanClass) { List urls = new ArrayList(); urls.add(generatePathMapping(beanName)); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java index ac52ebeb1a6..c6670649fed 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java @@ -123,6 +123,7 @@ public class ControllerClassNameHandlerMapping extends AbstractControllerUrlHand } + @Override protected String[] buildUrlsForHandler(String beanName, Class beanClass) { return generatePathMappings(beanClass); } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/throwaway/ThrowawayController.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/throwaway/ThrowawayController.java index e1c295af937..49535eac2b9 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/throwaway/ThrowawayController.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/throwaway/ThrowawayController.java @@ -54,6 +54,7 @@ import org.springframework.web.servlet.ModelAndView; * @deprecated as of Spring 2.5, in favor of annotation-based controllers. * To be removed in Spring 3.0. */ +@Deprecated public interface ThrowawayController { /** diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/throwaway/ThrowawayControllerHandlerAdapter.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/throwaway/ThrowawayControllerHandlerAdapter.java index a6a5dda7a35..0bb1fcdbb98 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/throwaway/ThrowawayControllerHandlerAdapter.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/throwaway/ThrowawayControllerHandlerAdapter.java @@ -36,6 +36,7 @@ import org.springframework.web.servlet.ModelAndView; * @deprecated as of Spring 2.5, in favor of annotation-based controllers. * To be removed in Spring 3.0. */ +@Deprecated public class ThrowawayControllerHandlerAdapter implements HandlerAdapter { public static final String DEFAULT_COMMAND_NAME = "throwawayController"; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/BindStatus.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/BindStatus.java index 12375213075..c3ceeff6e62 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/BindStatus.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/BindStatus.java @@ -323,6 +323,7 @@ public class BindStatus { } + @Override public String toString() { StringBuffer sb = new StringBuffer("BindStatus: "); sb.append("expression=[").append(this.expression).append("]; "); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java index 7126f51dada..134e26952c9 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java @@ -90,6 +90,7 @@ public class JspAwareRequestContext extends RequestContext { * in page, request, session or application scope; if not found, * returns the HttpServletRequest.getLocale(). */ + @Override protected Locale getFallbackLocale() { if (jstlPresent) { Locale locale = JstlPageLocaleResolver.getJstlLocale(getPageContext()); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JstlUtils.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JstlUtils.java index 5ece7eb9470..46525caae9a 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JstlUtils.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/JstlUtils.java @@ -117,6 +117,7 @@ public abstract class JstlUtils { this.request = request; } + @Override public ResourceBundle getResourceBundle() { HttpSession session = this.request.getSession(false); if (session != null) { @@ -129,6 +130,7 @@ public abstract class JstlUtils { return new MessageSourceResourceBundle(this.messageSource, getLocale()); } + @Override public Locale getLocale() { HttpSession session = this.request.getSession(false); if (session != null) { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java index 062fb873bbe..bdace3fcb56 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java @@ -58,6 +58,7 @@ public class BindErrorsTag extends HtmlEscapingAwareTag { } + @Override protected final int doStartTagInternal() throws ServletException, JspException { String resolvedName = ExpressionEvaluationUtils.evaluateString("name", this.name, pageContext); this.errors = getRequestContext().getErrors(resolvedName, isHtmlEscape()); @@ -71,6 +72,7 @@ public class BindErrorsTag extends HtmlEscapingAwareTag { } } + @Override public int doEndTag() { this.pageContext.removeAttribute(ERRORS_VARIABLE_NAME, PageContext.REQUEST_SCOPE); return EVAL_PAGE; @@ -85,6 +87,7 @@ public class BindErrorsTag extends HtmlEscapingAwareTag { } + @Override public void doFinally() { super.doFinally(); this.errors = null; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindTag.java index ce0dcf3d72b..d10b01753d7 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/BindTag.java @@ -101,6 +101,7 @@ public class BindTag extends HtmlEscapingAwareTag implements EditorAwareTag { } + @Override protected final int doStartTagInternal() throws Exception { String resolvedPath = ExpressionEvaluationUtils.evaluateString("path", getPath(), pageContext); @@ -133,6 +134,7 @@ public class BindTag extends HtmlEscapingAwareTag implements EditorAwareTag { return EVAL_BODY_INCLUDE; } + @Override public int doEndTag() { // Reset previous status values. if (this.previousPageStatus != null) { @@ -173,6 +175,7 @@ public class BindTag extends HtmlEscapingAwareTag implements EditorAwareTag { } + @Override public void doFinally() { super.doFinally(); this.status = null; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java index 9993ba0c175..bf76754db38 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java @@ -60,6 +60,7 @@ public class EscapeBodyTag extends HtmlEscapingAwareTag implements BodyTag { } + @Override protected int doStartTagInternal() { // do nothing return EVAL_BODY_BUFFERED; @@ -73,6 +74,7 @@ public class EscapeBodyTag extends HtmlEscapingAwareTag implements BodyTag { this.bodyContent = bodyContent; } + @Override public int doAfterBody() throws JspException { try { String content = readBodyContent(); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java index d036dbd798e..b7dfb13d813 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java @@ -45,6 +45,7 @@ public class HtmlEscapeTag extends RequestContextAwareTag { } + @Override protected int doStartTagInternal() throws JspException { boolean resolvedDefaultHtmlEscape = ExpressionEvaluationUtils.evaluateBoolean("defaultHtmlEscape", this.defaultHtmlEscape, pageContext); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/MessageTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/MessageTag.java index 5521bcd9e45..3ad70541900 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/MessageTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/MessageTag.java @@ -158,6 +158,7 @@ public class MessageTag extends HtmlEscapingAwareTag { * @see org.springframework.web.util.JavaScriptUtils#javaScriptEscape(String) * @see #writeMessage(String) */ + @Override protected final int doStartTagInternal() throws JspException, IOException { try { // Resolve the unescaped message. diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java index e6741645711..c4ccaddbe97 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java @@ -78,6 +78,7 @@ public class NestedPathTag extends TagSupport implements TryCatchFinally { } + @Override public int doStartTag() throws JspException { String resolvedPath = ExpressionEvaluationUtils.evaluateString("path", getPath(), pageContext); @@ -95,6 +96,7 @@ public class NestedPathTag extends TagSupport implements TryCatchFinally { /** * Reset any previous nestedPath value. */ + @Override public int doEndTag() { if (this.previousNestedPath != null) { // Expose previous nestedPath value. diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java index 79d1428f2fd..261ad9e913e 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java @@ -67,6 +67,7 @@ public abstract class RequestContextAwareTag extends TagSupport implements TryCa * @see #REQUEST_CONTEXT_PAGE_ATTRIBUTE * @see org.springframework.web.servlet.support.JspAwareRequestContext */ + @Override public final int doStartTag() throws JspException { this.requestContext = (RequestContext) this.pageContext.getAttribute(REQUEST_CONTEXT_PAGE_ATTRIBUTE); try { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java index 1992f92c667..4b9098acda5 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java @@ -45,6 +45,7 @@ public class ThemeTag extends MessageTag { /** * Use the theme MessageSource for theme message resolution. */ + @Override protected MessageSource getMessageSource() { return getRequestContext().getTheme().getMessageSource(); } @@ -52,6 +53,7 @@ public class ThemeTag extends MessageTag { /** * Return exception message that indicates the current theme. */ + @Override protected String getNoSuchMessageExceptionDescription(NoSuchMessageException ex) { return "Theme '" + getRequestContext().getTheme().getName() + "': " + ex.getMessage(); } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/TransformTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/TransformTag.java index b4ac8f8c77e..5535a024372 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/TransformTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/TransformTag.java @@ -90,6 +90,7 @@ public class TransformTag extends HtmlEscapingAwareTag { } + @Override protected final int doStartTagInternal() throws JspException { Object resolvedValue = this.value; if (this.value instanceof String) { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java index 9d88073d788..068f9bd461e 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java @@ -76,6 +76,7 @@ public abstract class AbstractCheckedElementTag extends AbstractHtmlInputElement /** * Return a unique ID for the bound name within the current PageContext. */ + @Override protected String autogenerateId() throws JspException { return TagIdGenerator.nextId(getName(), this.pageContext); } @@ -86,6 +87,7 @@ public abstract class AbstractCheckedElementTag extends AbstractHtmlInputElement * {@link org.springframework.web.servlet.tags.form.TagWriter}, * marking it as 'checked' if appropriate. */ + @Override protected abstract int writeTagContent(TagWriter tagWriter) throws JspException; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java index d61eac968d4..a539bb32b45 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java @@ -53,6 +53,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im * command object name is exposed. * @deprecated as of Spring 2.5, in favor of {@link FormTag#MODEL_ATTRIBUTE_VARIABLE_NAME} */ + @Deprecated public static final String COMMAND_NAME_VARIABLE_NAME = Conventions.getQualifiedAttributeName(AbstractFormTag.class, "commandName"); @@ -95,6 +96,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im *

May be a runtime expression; defaults to the value of {@link #getName()}. * Note that the default value may not be valid for certain tags. */ + @Override public void setId(String id) { this.id = id; } @@ -102,6 +104,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im /** * Get the value of the 'id' attribute. */ + @Override public String getId() { return this.id; } @@ -219,6 +222,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im /** * Disposes of the {@link BindStatus} instance. */ + @Override public void doFinally() { super.doFinally(); this.bindStatus = null; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java index e078c81f3f5..9dbfd3d5ce8 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java @@ -86,6 +86,7 @@ public abstract class AbstractFormTag extends HtmlEscapingAwareTag { * the created {@link TagWriter} to the {@link #writeTagContent(TagWriter)} method. * @return the value returned by {@link #writeTagContent(TagWriter)} */ + @Override protected final int doStartTagInternal() throws Exception { return writeTagContent(createTagWriter()); } @@ -111,6 +112,7 @@ public abstract class AbstractFormTag extends HtmlEscapingAwareTag { /** * Overridden to default to true in case of no explicit default given. */ + @Override protected boolean isDefaultHtmlEscape() { Boolean defaultHtmlEscape = getRequestContext().getDefaultHtmlEscape(); return (defaultHtmlEscape == null || defaultHtmlEscape.booleanValue()); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java index c66edb12168..bc098505a17 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java @@ -40,6 +40,7 @@ public abstract class AbstractHtmlElementBodyTag extends AbstractHtmlElementTag private TagWriter tagWriter; + @Override protected int writeTagContent(TagWriter tagWriter) throws JspException { onWriteTagContent(); this.tagWriter = tagWriter; @@ -58,6 +59,7 @@ public abstract class AbstractHtmlElementBodyTag extends AbstractHtmlElementTag * {@link #renderDefaultContent render the default content}. * @return Tag#EVAL_PAGE */ + @Override public int doEndTag() throws JspException { if (shouldRender()) { if (this.bodyContent != null && StringUtils.hasText(this.bodyContent.getString())) { @@ -83,6 +85,7 @@ public abstract class AbstractHtmlElementBodyTag extends AbstractHtmlElementTag /** * Clean up any attributes and stored resources. */ + @Override public void doFinally() { super.doFinally(); removeAttributes(); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java index 55a2267e499..2954d16f226 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java @@ -375,6 +375,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen * Writes the default attributes configured via this base class to the supplied {@link TagWriter}. * Subclasses should call this when they want the base attribute set to be written to the output. */ + @Override protected void writeDefaultAttributes(TagWriter tagWriter) throws JspException { super.writeDefaultAttributes(tagWriter); writeOptionalAttributes(tagWriter); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java index 1703839e82a..d58634c703e 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java @@ -172,6 +172,7 @@ public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag /** * Adds input-specific optional attributes as defined by this base class. */ + @Override protected void writeOptionalAttributes(TagWriter tagWriter) throws JspException { super.writeOptionalAttributes(tagWriter); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java index 69895eb210c..a529ccae0c1 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java @@ -164,6 +164,7 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem * Appends a counter to a specified id as well, * since we're dealing with multiple HTML elements. */ + @Override protected String resolveId() throws JspException { Object id = evaluate("id", getId()); if (id != null) { @@ -178,6 +179,7 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem * {@link #setItems(Object)} values. Marks the element as checked if the * value matches the bound value. */ + @Override protected int writeTagContent(TagWriter tagWriter) throws JspException { Object items = getItems(); Object itemsObject = (items instanceof String ? evaluate("items", (String) items) : items); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java index 7d57fb46db6..e4df69d0778 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java @@ -76,6 +76,7 @@ public abstract class AbstractSingleCheckedElementTag extends AbstractCheckedEle * {@link #setValue(Object) value}. Marks the element as checked if the * value matches the {@link #getValue bound value}. */ + @Override protected int writeTagContent(TagWriter tagWriter) throws JspException { tagWriter.startTag("input"); String id = resolveId(); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java index 29ba37f508a..a809ae8557b 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java @@ -47,6 +47,7 @@ import org.springframework.web.bind.WebDataBinder; */ public class CheckboxTag extends AbstractSingleCheckedElementTag { + @Override protected int writeTagContent(TagWriter tagWriter) throws JspException { super.writeTagContent(tagWriter); @@ -62,6 +63,7 @@ public class CheckboxTag extends AbstractSingleCheckedElementTag { return SKIP_BODY; } + @Override protected void writeTagDetails(TagWriter tagWriter) throws JspException { tagWriter.writeAttribute("type", "checkbox"); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java index 0114d8c2319..005720725be 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java @@ -33,6 +33,7 @@ import org.springframework.web.bind.WebDataBinder; */ public class CheckboxesTag extends AbstractMultiCheckedElementTag { + @Override protected int writeTagContent(TagWriter tagWriter) throws JspException { super.writeTagContent(tagWriter); @@ -48,6 +49,7 @@ public class CheckboxesTag extends AbstractMultiCheckedElementTag { return SKIP_BODY; } + @Override protected String getInputType() { return "checkbox"; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java index f216d05205c..cd9b41da14c 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java @@ -106,6 +106,7 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag { *

Simply returns null because the 'name' attribute * is not a validate attribute for the 'span' element. */ + @Override protected String getName() throws JspException { return null; } @@ -118,6 +119,7 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag { * @return the value for the HTML 'id' attribute * @see #getPropertyPath() */ + @Override protected String autogenerateId() throws JspException { String path = getPropertyPath(); if ("".equals(path)) { @@ -132,6 +134,7 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag { *

Only renders output when there are errors for the configured {@link #setPath path}. * @return true only when there are errors for the configured {@link #setPath path} */ + @Override protected boolean shouldRender() throws JspException { try { return getBindStatus().isError(); @@ -142,6 +145,7 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag { } } + @Override protected void renderDefaultContent(TagWriter tagWriter) throws JspException { tagWriter.startTag(getElement()); writeDefaultAttributes(tagWriter); @@ -163,6 +167,7 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag { *

Only called if {@link #shouldRender()} returns true. * @see #removeAttributes() */ + @Override protected void exposeAttributes() throws JspException { List errorMessages = new ArrayList(); errorMessages.addAll(Arrays.asList(getBindStatus().getErrorMessages())); @@ -176,6 +181,7 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag { * {@link #MESSAGES_ATTRIBUTE this key} in the {@link PageContext#PAGE_SCOPE}. * @see #exposeAttributes() */ + @Override protected void removeAttributes() { if (this.errorMessagesWereExposed) { if (this.oldMessages != null) { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java index 6cc5c356ee4..81352b361cf 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java @@ -153,6 +153,7 @@ public class FormTag extends AbstractHtmlElementTag { /** * Get the value of the 'name' attribute. */ + @Override protected String getName() throws JspException { return this.name; } @@ -285,6 +286,7 @@ public class FormTag extends AbstractHtmlElementTag { * @param tagWriter the {@link TagWriter} to which the form content is to be written * @return {@link javax.servlet.jsp.tagext.Tag#EVAL_BODY_INCLUDE} */ + @Override protected int writeTagContent(TagWriter tagWriter) throws JspException { this.tagWriter = tagWriter; @@ -319,6 +321,7 @@ public class FormTag extends AbstractHtmlElementTag { /** * Autogenerated IDs correspond to the form object name. */ + @Override protected String autogenerateId() throws JspException { return resolveModelAttribute(); } @@ -373,6 +376,7 @@ public class FormTag extends AbstractHtmlElementTag { * Closes the 'form' block tag and removes the form object name * from the {@link javax.servlet.jsp.PageContext}. */ + @Override public int doEndTag() throws JspException { this.tagWriter.endTag(); this.pageContext.removeAttribute(MODEL_ATTRIBUTE_VARIABLE_NAME, PageContext.REQUEST_SCOPE); @@ -391,6 +395,7 @@ public class FormTag extends AbstractHtmlElementTag { /** * Clears the stored {@link TagWriter}. */ + @Override public void doFinally() { super.doFinally(); this.tagWriter = null; @@ -401,6 +406,7 @@ public class FormTag extends AbstractHtmlElementTag { /** * Override resolve CSS class since error class is not supported. */ + @Override protected String resolveCssClass() throws JspException { return ObjectUtils.getDisplayString(evaluate("cssClass", getCssClass())); } @@ -409,6 +415,7 @@ public class FormTag extends AbstractHtmlElementTag { * Unsupported for forms. * @throws UnsupportedOperationException always */ + @Override public void setPath(String path) { throw new UnsupportedOperationException("The 'path' attribute is not supported for forms"); } @@ -417,6 +424,7 @@ public class FormTag extends AbstractHtmlElementTag { * Unsupported for forms. * @throws UnsupportedOperationException always */ + @Override public void setCssErrorClass(String cssErrorClass) { throw new UnsupportedOperationException("The 'cssErrorClass' attribute is not supported for forms"); } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java index 5f5b5e71efb..db73d23e0f0 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java @@ -39,6 +39,7 @@ public class HiddenInputTag extends AbstractDataBoundFormElementTag { * @see #writeDefaultAttributes(TagWriter) * @see #getBoundValue() */ + @Override protected int writeTagContent(TagWriter tagWriter) throws JspException { tagWriter.startTag("input"); writeDefaultAttributes(tagWriter); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java index 344df2113d4..92d746577c8 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java @@ -133,6 +133,7 @@ public class InputTag extends AbstractHtmlInputElementTag { * Uses the value returned by {@link #getType()} to determine which * type of 'input' element to render. */ + @Override protected int writeTagContent(TagWriter tagWriter) throws JspException { tagWriter.startTag("input"); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java index 45608527c3a..b2237cad903 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java @@ -83,6 +83,7 @@ public class LabelTag extends AbstractHtmlElementTag { * that body content is written correctly. * @return {@link javax.servlet.jsp.tagext.Tag#EVAL_BODY_INCLUDE} */ + @Override protected int writeTagContent(TagWriter tagWriter) throws JspException { tagWriter.startTag(LABEL_TAG); tagWriter.writeAttribute(FOR_ATTRIBUTE, resolveFor()); @@ -98,6 +99,7 @@ public class LabelTag extends AbstractHtmlElementTag { * 'label' tag. * @return the value for the HTML 'name' attribute */ + @Override protected String getName() throws JspException { // This also suppresses the 'id' attribute (which is okay for a

This method can be overridden if custom behavior is needed. */ + @Override protected void renderMergedTemplateModel( Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -351,6 +353,7 @@ public class FreeMarkerView extends AbstractTemplateView { */ private static class GenericServletAdapter extends GenericServlet { + @Override public void service(ServletRequest servletRequest, ServletResponse servletResponse) { // no-op } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java index 2e86202f55f..a0c376df35f 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java @@ -53,6 +53,7 @@ public class FreeMarkerViewResolver extends AbstractTemplateViewResolver { * Requires FreeMarkerView. * @see FreeMarkerView */ + @Override protected Class requiredViewClass() { return FreeMarkerView.class; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java index e8ce7d6e1b4..5bc4d3af504 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java @@ -47,6 +47,7 @@ import org.springframework.web.util.WebUtils; */ public abstract class AbstractJasperReportsSingleFormatView extends AbstractJasperReportsView { + @Override protected boolean generatesDownloadContent() { return !useWriter(); } @@ -55,6 +56,7 @@ public abstract class AbstractJasperReportsSingleFormatView extends AbstractJasp * Perform rendering for a single Jasper Reports exporter, that is, * for a pre-defined output format. */ + @Override protected void renderReport(JasperPrint populatedReport, Map model, HttpServletResponse response) throws Exception { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java index 34061060ed2..d6c10325732 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java @@ -313,6 +313,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView { * JasperReports views do not strictly required a 'url' value. * Alternatively, the {@link #getReport()} template method may be overridden. */ + @Override protected boolean isUrlRequired() { return false; } @@ -323,6 +324,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView { *

Subclasses can add custom initialization logic by overriding * the {@link #onInit} method. */ + @Override protected final void initApplicationContext() throws ApplicationContextException { this.report = loadReport(); @@ -547,6 +549,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView { * acccording to the getReportData method. * @see #getReportData */ + @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java index 34009e9faaa..88d9a41a0eb 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java @@ -63,6 +63,7 @@ public class ConfigurableJasperReportsView extends AbstractJasperReportsSingleFo /** * Checks that the {@link #setExporterClass(Class) exporterClass} property is specified. */ + @Override protected void onInit() { if (this.exporterClass == null) { throw new IllegalArgumentException("exporterClass is required"); @@ -75,6 +76,7 @@ public class ConfigurableJasperReportsView extends AbstractJasperReportsSingleFo * @see #setExporterClass(Class) * @see BeanUtils#instantiateClass(Class) */ + @Override protected JRExporter createExporter() { return (JRExporter) BeanUtils.instantiateClass(this.exporterClass); } @@ -83,6 +85,7 @@ public class ConfigurableJasperReportsView extends AbstractJasperReportsSingleFo * Indicates how the {@link JRExporter} should render its data. * @see #setUseWriter(boolean) */ + @Override protected boolean useWriter() { return this.useWriter; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java index eb5720bad85..3ae0db1826a 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java @@ -33,10 +33,12 @@ public class JasperReportsCsvView extends AbstractJasperReportsSingleFormatView setContentType("text/csv"); } + @Override protected JRExporter createExporter() { return new JRCsvExporter(); } + @Override protected boolean useWriter() { return true; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java index 55f809ec0a9..86a6b64934d 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java @@ -33,10 +33,12 @@ public class JasperReportsHtmlView extends AbstractJasperReportsSingleFormatView setContentType("text/html"); } + @Override protected JRExporter createExporter() { return new JRHtmlExporter(); } + @Override protected boolean useWriter() { return true; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java index 4d2b4a0b839..807c89acff1 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java @@ -168,6 +168,7 @@ public class JasperReportsMultiFormatView extends AbstractJasperReportsView { } + @Override protected boolean generatesDownloadContent() { return true; } @@ -177,6 +178,7 @@ public class JasperReportsMultiFormatView extends AbstractJasperReportsView { * key to lookup the appropriate view class from the mappings. The rendering of the * report is then delegated to an instance of that view class. */ + @Override protected void renderReport(JasperPrint populatedReport, Map model, HttpServletResponse response) throws Exception { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java index a2706a5106a..bc6966a5fab 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java @@ -33,10 +33,12 @@ public class JasperReportsPdfView extends AbstractJasperReportsSingleFormatView setContentType("application/pdf"); } + @Override protected JRExporter createExporter() { return new JRPdfExporter(); } + @Override protected boolean useWriter() { return false; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java index 29f78d7fcfb..8a741e6055e 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java @@ -55,6 +55,7 @@ public class JasperReportsViewResolver extends UrlBasedViewResolver { /** * Requires the view class to be a subclass of {@link AbstractJasperReportsView}. */ + @Override protected Class requiredViewClass() { return AbstractJasperReportsView.class; } @@ -116,6 +117,7 @@ public class JasperReportsViewResolver extends UrlBasedViewResolver { } + @Override protected AbstractUrlBasedView buildView(String viewName) throws Exception { AbstractJasperReportsView view = (AbstractJasperReportsView) super.buildView(viewName); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java index 26c783c9c11..60751b89d01 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java @@ -33,10 +33,12 @@ public class JasperReportsXlsView extends AbstractJasperReportsSingleFormatView setContentType("application/vnd.ms-excel"); } + @Override protected JRExporter createExporter() { return new JRXlsExporter(); } + @Override protected boolean useWriter() { return false; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java index 16c016ad4f3..8a76f833d64 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java @@ -42,6 +42,7 @@ public class SimpleSpringPreparerFactory extends AbstractSpringPreparerFactory { private final Map sharedPreparers = CollectionFactory.createConcurrentMapIfPossible(16); + @Override protected ViewPreparer getPreparer(String name, WebApplicationContext context) throws TilesException { // Quick check on the concurrent map first, with minimal locking. ViewPreparer preparer = (ViewPreparer) this.sharedPreparers.get(name); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java index 2c8c890b3b4..3216059f8e7 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java @@ -34,6 +34,7 @@ import org.springframework.web.context.WebApplicationContext; */ public class SpringBeanPreparerFactory extends AbstractSpringPreparerFactory { + @Override protected ViewPreparer getPreparer(String name, WebApplicationContext context) throws TilesException { return (ViewPreparer) context.getBean(name, ViewPreparer.class); } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java index 0f2ee443440..4e0ff72381b 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java @@ -40,6 +40,7 @@ import org.springframework.web.servlet.support.RequestContextUtils; */ public class SpringLocaleResolver extends DefaultLocaleResolver { + @Override public Locale resolveLocale(TilesRequestContext context) { if (context.getRequest() instanceof HttpServletRequest) { return RequestContextUtils.getLocale((HttpServletRequest) context.getRequest()); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java index 3042d57d702..850ac27c379 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java @@ -49,6 +49,7 @@ import org.springframework.web.util.WebUtils; */ public class TilesView extends AbstractUrlBasedView { + @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java index a6561f14170..c476eb45469 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java @@ -125,6 +125,7 @@ public class VelocityConfigurer extends VelocityEngineFactory * loader in order to load the spring Velocity macros from the class path. * @see org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader */ + @Override protected void postProcessVelocityEngine(VelocityEngine velocityEngine) { velocityEngine.setApplicationAttribute(ServletContext.class.getName(), this.servletContext); velocityEngine.setProperty( diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java index b6a455bf906..c923c689383 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java @@ -118,6 +118,7 @@ public class VelocityLayoutView extends VelocityToolboxView { * Note that during rendering of the screen content, the layout template * can be changed which may invalidate any early checking done here. */ + @Override protected void checkTemplate() throws ApplicationContextException { super.checkTemplate(); @@ -141,6 +142,7 @@ public class VelocityLayoutView extends VelocityToolboxView { * value of screenContentKey). The layout template is then merged with the * modified Context in the super class. */ + @Override protected void doRender(Context context, HttpServletResponse response) throws Exception { renderScreenContent(context); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java index ad317462162..fb358e16316 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java @@ -45,6 +45,7 @@ public class VelocityLayoutViewResolver extends VelocityViewResolver { * Requires VelocityLayoutView. * @see VelocityLayoutView */ + @Override protected Class requiredViewClass() { return VelocityLayoutView.class; } @@ -88,6 +89,7 @@ public class VelocityLayoutViewResolver extends VelocityViewResolver { } + @Override protected AbstractUrlBasedView buildView(String viewName) throws Exception { VelocityLayoutView view = (VelocityLayoutView) super.buildView(viewName); // Use not-null checks to preserve VelocityLayoutView's defaults. diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java index 93f6cf15de7..a4485153902 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java @@ -100,6 +100,7 @@ public class VelocityToolboxView extends VelocityView { * initialization of ViewTool instances. * @see #initTool */ + @Override protected Context createVelocityContext( Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -125,6 +126,7 @@ public class VelocityToolboxView extends VelocityView { * @see org.apache.velocity.tools.view.tools.ViewTool#init(Object) * @see org.apache.velocity.tools.view.tools.LinkTool#init(Object) */ + @Override protected void initTool(Object tool, Context velocityContext) throws Exception { // Initialize ViewTool instances with the Velocity context. // Despite having an "init(Object)" method, all known ViewTool diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java index cf4184d5647..111863e0bfe 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java @@ -247,6 +247,7 @@ public class VelocityView extends AbstractTemplateView { * Invoked on startup. Looks for a single VelocityConfig bean to * find the relevant VelocityEngine for this factory. */ + @Override protected void initApplicationContext() throws BeansException { super.initApplicationContext(); @@ -308,6 +309,7 @@ public class VelocityView extends AbstractTemplateView { * Output is directed to the servlet response. *

This method can be overridden if custom behavior is needed. */ + @Override protected void renderMergedTemplateModel( Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -575,6 +577,7 @@ public class VelocityView extends AbstractTemplateView { this.locale = locale; } + @Override public Locale getLocale() { return this.locale; } @@ -594,6 +597,7 @@ public class VelocityView extends AbstractTemplateView { this.locale = locale; } + @Override public Locale getLocale() { return this.locale; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java index 69fcc6b32d5..350d270b363 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java @@ -66,6 +66,7 @@ public class VelocityViewResolver extends AbstractTemplateViewResolver { * Requires VelocityView. * @see VelocityView */ + @Override protected Class requiredViewClass() { return VelocityView.class; } @@ -119,6 +120,7 @@ public class VelocityViewResolver extends AbstractTemplateViewResolver { } + @Override protected void initApplicationContext() { super.initApplicationContext(); @@ -138,6 +140,7 @@ public class VelocityViewResolver extends AbstractTemplateViewResolver { } + @Override protected AbstractUrlBasedView buildView(String viewName) throws Exception { VelocityView view = (VelocityView) super.buildView(viewName); view.setVelocityFormatterAttribute(this.velocityFormatterAttribute); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java index 4a8c4431011..271c788a0f2 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java @@ -83,6 +83,7 @@ import org.springframework.web.util.NestedServletException; * @deprecated since Spring 2.5; superseded by {@link XsltView} and its * more flexible {@link XsltView#locateSource} mechanism */ +@Deprecated public abstract class AbstractXsltView extends AbstractView { /** The default content type if no stylesheet specified */ @@ -129,6 +130,7 @@ public abstract class AbstractXsltView extends AbstractView { } + @Override public void setContentType(String contentType) { super.setContentType(contentType); this.customContentTypeSet = true; @@ -259,6 +261,7 @@ public abstract class AbstractXsltView extends AbstractView { * Here we load our template, as we need the * {@link org.springframework.context.ApplicationContext} to do it. */ + @Override protected final void initApplicationContext() throws ApplicationContextException { this.transformerFactory = newTransformerFactory(this.transformerFactoryClass); this.transformerFactory.setErrorListener(this.errorListener); @@ -315,6 +318,7 @@ public abstract class AbstractXsltView extends AbstractView { } + @Override protected final void renderMergedOutputModel( Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -437,6 +441,7 @@ public abstract class AbstractXsltView extends AbstractView { * @deprecated as of Spring 2.0.4, in favor of the * {@link #getParameters(HttpServletRequest)} variant */ + @Deprecated protected Map getParameters() { return null; } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java index 1e565fb7a9f..b040e185fdf 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java @@ -173,6 +173,7 @@ public class XsltView extends AbstractUrlBasedView { /** * Initialize this XsltView's TransformerFactory. */ + @Override protected void initApplicationContext() throws BeansException { this.transformerFactory = newTransformerFactory(this.transformerFactoryClass); this.transformerFactory.setErrorListener(this.errorListener); @@ -220,6 +221,7 @@ public class XsltView extends AbstractUrlBasedView { } + @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java index 996cea03af1..3943e534729 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java @@ -117,10 +117,12 @@ public class XsltViewResolver extends UrlBasedViewResolver { } + @Override protected Class requiredViewClass() { return XsltView.class; } + @Override protected AbstractUrlBasedView buildView(String viewName) throws Exception { XsltView view = (XsltView) super.buildView(viewName); view.setSourceKey(this.sourceKey);