diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java index f9fc168e5ae..5e0be9a2e60 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java @@ -105,6 +105,7 @@ public class BurlapClientInterceptor extends UrlBasedRemoteAccessor implements M } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); prepare(); diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java index a34b5718eab..83a3912cbe8 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java @@ -45,6 +45,7 @@ public class BurlapProxyFactoryBean extends BurlapClientInterceptor implements F private Object serviceProxy; + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); this.serviceProxy = new ProxyFactory(getServiceInterface(), this).getProxy(getBeanClassLoader()); diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/Hessian1SkeletonInvoker.java b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/Hessian1SkeletonInvoker.java index 517d2242d9a..62b25571eb6 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/Hessian1SkeletonInvoker.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/Hessian1SkeletonInvoker.java @@ -56,6 +56,7 @@ class Hessian1SkeletonInvoker extends HessianSkeletonInvoker { } } + @Override public void invoke(InputStream inputStream, OutputStream outputStream) throws Throwable { HessianInput in = new HessianInput(inputStream); HessianOutput out = new HessianOutput(outputStream); diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/Hessian2SkeletonInvoker.java b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/Hessian2SkeletonInvoker.java index c491dbc1c74..2e66647be82 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/Hessian2SkeletonInvoker.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/Hessian2SkeletonInvoker.java @@ -55,6 +55,7 @@ class Hessian2SkeletonInvoker extends HessianSkeletonInvoker { this.debugLogger = debugLog; } + @Override public void invoke(final InputStream inputStream, final OutputStream outputStream) throws Throwable { InputStream isToUse = inputStream; OutputStream osToUse = outputStream; diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java index 7883ff0da62..2140f1532f0 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java @@ -177,6 +177,7 @@ public class HessianClientInterceptor extends UrlBasedRemoteAccessor implements } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); prepare(); diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java index 58b5a6cb04d..01857e51598 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java @@ -45,6 +45,7 @@ public class HessianProxyFactoryBean extends HessianClientInterceptor implements private Object serviceProxy; + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); this.serviceProxy = new ProxyFactory(getServiceInterface(), this).getProxy(getBeanClassLoader()); diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java b/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java index 1c8a32031d6..173ad2faa88 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java @@ -119,6 +119,7 @@ public class CommonsHttpInvokerRequestExecutor extends AbstractHttpInvokerReques * @see #validateResponse * @see #getResponseBody */ + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws IOException, ClassNotFoundException { diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java b/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java index c99028dc850..df2fba95ccc 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java @@ -122,6 +122,7 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor return this.httpInvokerRequestExecutor; } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java b/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java index 3c62cb6b9ab..325a7f35ace 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java @@ -53,6 +53,7 @@ public class HttpInvokerProxyFactoryBean extends HttpInvokerClientInterceptor private Object serviceProxy; + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); if (getServiceInterface() == null) { diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java b/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java index db72c2d04f5..4f13e0de6c9 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java @@ -55,6 +55,7 @@ public class SimpleHttpInvokerRequestExecutor extends AbstractHttpInvokerRequest * @see #validateResponse * @see #readResponseBody */ + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws IOException, ClassNotFoundException { diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java b/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java index 34214cef06c..566630be749 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java @@ -56,6 +56,7 @@ public class JaxRpcPortProxyFactoryBean extends JaxRpcPortClientInterceptor this.beanClassLoader = classLoader; } + @Override public void afterPropertiesSet() { if (getServiceInterface() == null) { // Use JAX-RPC port interface (a traditional RMI interface) diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java b/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java index 16349e29295..fe888725306 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java @@ -46,18 +46,22 @@ public class JaxRpcSoapFaultException extends SoapFaultException { } + @Override public String getFaultCode() { return getOriginalException().getFaultCode().toString(); } + @Override public QName getFaultCodeAsQName() { return getOriginalException().getFaultCode(); } + @Override public String getFaultString() { return getOriginalException().getFaultString(); } + @Override public String getFaultActor() { return getOriginalException().getFaultActor(); } diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java b/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java index 78267875945..a85d8442882 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java @@ -45,6 +45,7 @@ public class JaxWsPortProxyFactoryBean extends JaxWsPortClientInterceptor this.beanClassLoader = classLoader; } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java b/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java index 038e3c5b19b..0dcc3e68374 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java @@ -47,18 +47,22 @@ public class JaxWsSoapFaultException extends SoapFaultException { } + @Override public String getFaultCode() { return getFault().getFaultCode(); } + @Override public QName getFaultCodeAsQName() { return getFault().getFaultCodeAsQName(); } + @Override public String getFaultString() { return getFault().getFaultString(); } + @Override public String getFaultActor() { return getFault().getFaultActor(); } diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java b/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java index 9999c0384e6..b7afd9523c2 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java @@ -149,6 +149,7 @@ public class SimpleHttpServerJaxWsServiceExporter extends AbstractJaxWsServiceEx } + @Override public void afterPropertiesSet() throws Exception { if (this.server == null) { InetSocketAddress address = (this.hostname != null ? @@ -163,6 +164,7 @@ public class SimpleHttpServerJaxWsServiceExporter extends AbstractJaxWsServiceEx super.afterPropertiesSet(); } + @Override protected void publishEndpoint(Endpoint endpoint, WebService annotation) { String fullPath = this.basePath + annotation.serviceName(); HttpContext httpContext = this.server.createContext(fullPath); @@ -175,6 +177,7 @@ public class SimpleHttpServerJaxWsServiceExporter extends AbstractJaxWsServiceEx endpoint.publish(httpContext); } + @Override public void destroy() { super.destroy(); if (this.localServer) { diff --git a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java b/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java index 3a7567be25c..8ddf4b63b76 100644 --- a/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java +++ b/org.springframework.web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java @@ -62,6 +62,7 @@ public class SimpleJaxWsServiceExporter extends AbstractJaxWsServiceExporter { } + @Override protected void publishEndpoint(Endpoint endpoint, WebService annotation) { String fullAddress = this.baseAddress + annotation.serviceName(); endpoint.publish(fullAddress); diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/ContextLoaderServlet.java b/org.springframework.web/src/main/java/org/springframework/web/context/ContextLoaderServlet.java index 9359c8849c5..e25c55bdfce 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/ContextLoaderServlet.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/ContextLoaderServlet.java @@ -76,6 +76,7 @@ public class ContextLoaderServlet extends HttpServlet { /** * Initialize the root web application context. */ + @Override public void init() throws ServletException { this.contextLoader = createContextLoader(); this.contextLoader.initWebApplicationContext(getServletContext()); @@ -101,6 +102,7 @@ public class ContextLoaderServlet extends HttpServlet { /** * Close the root web application context. */ + @Override public void destroy() { if (this.contextLoader != null) { this.contextLoader.closeWebApplicationContext(getServletContext()); @@ -113,6 +115,7 @@ public class ContextLoaderServlet extends HttpServlet { * ever be created in web.xml. That's why a correctly invoked Servlet 2.3 * listener is much more appropriate for initialization work ;-) */ + @Override public void service(HttpServletRequest request, HttpServletResponse response) throws IOException { getServletContext().log( "Attempt to call service method on ContextLoaderServlet as [" + @@ -121,6 +124,7 @@ public class ContextLoaderServlet extends HttpServlet { } + @Override public String getServletInfo() { return "ContextLoaderServlet for Servlet API 2.3 " + "(deprecated in favor of ContextLoaderListener for Servlet API 2.4)"; diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java b/org.springframework.web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java index d83e2d3148d..a83defa82fa 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java @@ -110,6 +110,7 @@ public class FacesWebRequest extends FacesRequestAttributes implements NativeWeb return buffer.toString(); } + @Override public String toString() { return "FacesWebRequest: " + getDescription(true); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestScope.java b/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestScope.java index 4257f850a15..4a557add554 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestScope.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/request/RequestScope.java @@ -43,6 +43,7 @@ package org.springframework.web.context.request; */ public class RequestScope extends AbstractRequestAttributesScope { + @Override protected int getScope() { return RequestAttributes.SCOPE_REQUEST; } diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java b/org.springframework.web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java index cf4506d8736..874483339d4 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java @@ -208,6 +208,7 @@ public class ServletRequestAttributes extends AbstractRequestAttributes { * Update all accessed session attributes through session.setAttribute * calls, explicitly indicating to the container that they might have been modified. */ + @Override protected void updateAccessedSessionAttributes() { // Store session reference for access after request completion. this.session = this.request.getSession(false); @@ -245,6 +246,7 @@ public class ServletRequestAttributes extends AbstractRequestAttributes { } + @Override public String toString() { return this.request.toString(); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java b/org.springframework.web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java index 51d43ff7748..554f75a41e2 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java @@ -159,6 +159,7 @@ public class ServletWebRequest extends ServletRequestAttributes implements Nativ return buffer.toString(); } + @Override public String toString() { return "ServletWebRequest: " + getDescription(true); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/request/SessionScope.java b/org.springframework.web/src/main/java/org/springframework/web/context/request/SessionScope.java index 0d0c5f60aff..88d5d1fe56e 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/request/SessionScope.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/request/SessionScope.java @@ -76,6 +76,7 @@ public class SessionScope extends AbstractRequestAttributesScope { } + @Override protected int getScope() { return this.scope; } @@ -84,6 +85,7 @@ public class SessionScope extends AbstractRequestAttributesScope { return RequestContextHolder.currentRequestAttributes().getSessionId(); } + @Override public Object get(String name, ObjectFactory objectFactory) { Object mutex = RequestContextHolder.currentRequestAttributes().getSessionMutex(); synchronized (mutex) { @@ -91,6 +93,7 @@ public class SessionScope extends AbstractRequestAttributesScope { } } + @Override public Object remove(String name) { Object mutex = RequestContextHolder.currentRequestAttributes().getSessionMutex(); synchronized (mutex) { diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java index fcb815c0a46..0561b4139ff 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java @@ -125,6 +125,7 @@ public abstract class AbstractRefreshableWebApplicationContext extends AbstractR return this.namespace; } + @Override public String[] getConfigLocations() { return super.getConfigLocations(); } @@ -133,6 +134,7 @@ public abstract class AbstractRefreshableWebApplicationContext extends AbstractR /** * Register request/session scopes, a {@link ServletContextAwareProcessor}, etc. */ + @Override protected void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { beanFactory.addBeanPostProcessor(new ServletContextAwareProcessor(this.servletContext, this.servletConfig)); beanFactory.ignoreDependencyInterface(ServletContextAware.class); @@ -147,6 +149,7 @@ public abstract class AbstractRefreshableWebApplicationContext extends AbstractR * This implementation supports file paths beneath the root of the ServletContext. * @see ServletContextResource */ + @Override protected Resource getResourceByPath(String path) { return new ServletContextResource(this.servletContext, path); } @@ -155,6 +158,7 @@ public abstract class AbstractRefreshableWebApplicationContext extends AbstractR * This implementation supports pattern matching in unexpanded WARs too. * @see ServletContextResourcePatternResolver */ + @Override protected ResourcePatternResolver getResourcePatternResolver() { return new ServletContextResourcePatternResolver(this); } @@ -162,6 +166,7 @@ public abstract class AbstractRefreshableWebApplicationContext extends AbstractR /** * Initialize the theme capability. */ + @Override protected void onRefresh() { this.themeSource = UiApplicationContextUtils.initThemeSource(this); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java index dd653aa4d86..355681fc02b 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java @@ -77,6 +77,7 @@ public class ContextExposingHttpServletRequest extends HttpServletRequestWrapper } + @Override public Object getAttribute(String name) { if ((this.explicitAttributes == null || !this.explicitAttributes.contains(name)) && (this.exposedContextBeanNames == null || this.exposedContextBeanNames.contains(name)) && @@ -88,6 +89,7 @@ public class ContextExposingHttpServletRequest extends HttpServletRequestWrapper } } + @Override public void setAttribute(String name, Object value) { super.setAttribute(name, value); if (this.explicitAttributes == null) { diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java index 846b5e6e72d..25bc3ca2c10 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java @@ -99,6 +99,7 @@ public class GenericWebApplicationContext extends GenericApplicationContext * Register ServletContextAwareProcessor. * @see ServletContextAwareProcessor */ + @Override protected void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { beanFactory.addBeanPostProcessor(new ServletContextAwareProcessor(this.servletContext)); beanFactory.ignoreDependencyInterface(ServletContextAware.class); @@ -111,6 +112,7 @@ public class GenericWebApplicationContext extends GenericApplicationContext * This implementation supports file paths beneath the root of the ServletContext. * @see ServletContextResource */ + @Override protected Resource getResourceByPath(String path) { return new ServletContextResource(this.servletContext, path); } @@ -119,6 +121,7 @@ public class GenericWebApplicationContext extends GenericApplicationContext * This implementation supports pattern matching in unexpanded WARs too. * @see ServletContextResourcePatternResolver */ + @Override protected ResourcePatternResolver getResourcePatternResolver() { return new ServletContextResourcePatternResolver(this); } @@ -126,6 +129,7 @@ public class GenericWebApplicationContext extends GenericApplicationContext /** * Initialize the theme capability. */ + @Override protected void onRefresh() { this.themeSource = UiApplicationContextUtils.initThemeSource(this); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java index a50b9955fe7..46e798956e9 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java @@ -51,12 +51,14 @@ public class HttpRequestHandlerServlet extends HttpServlet { private HttpRequestHandler target; + @Override public void init() throws ServletException { WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); this.target = (HttpRequestHandler) wac.getBean(getServletName(), HttpRequestHandler.class); } + @Override protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java index 5b8e356c8ed..a999434e018 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java @@ -150,6 +150,7 @@ public class RequestHandledEvent extends ApplicationEvent { return sb.toString(); } + @Override public String toString() { return ("RequestHandledEvent: " + getDescription()); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java index 069bad13ebd..0e7254f68e0 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java @@ -110,6 +110,7 @@ public class ServletContextPropertyPlaceholderConfigurer extends PropertyPlaceho } + @Override protected String resolvePlaceholder(String placeholder, Properties props) { String value = null; if (this.contextOverride && this.servletContext != null) { diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResource.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResource.java index e0d5612e693..fb16a0fc575 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResource.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResource.java @@ -96,6 +96,7 @@ public class ServletContextResource extends AbstractResource implements ContextR * This implementation checks ServletContext.getResource. * @see javax.servlet.ServletContext#getResource(String) */ + @Override public boolean exists() { try { URL url = this.servletContext.getResource(this.path); @@ -124,6 +125,7 @@ public class ServletContextResource extends AbstractResource implements ContextR * but throws a FileNotFoundException if no resource found. * @see javax.servlet.ServletContext#getResource(String) */ + @Override public URL getURL() throws IOException { URL url = this.servletContext.getResource(this.path); if (url == null) { @@ -138,6 +140,7 @@ public class ServletContextResource extends AbstractResource implements ContextR * but throws a FileNotFoundException if not found or not resolvable. * @see javax.servlet.ServletContext#getRealPath(String) */ + @Override public File getFile() throws IOException { String realPath = WebUtils.getRealPath(this.servletContext, this.path); return new File(realPath); @@ -148,6 +151,7 @@ public class ServletContextResource extends AbstractResource implements ContextR * relative to the path of the underlying file of this resource descriptor. * @see org.springframework.util.StringUtils#applyRelativePath(String, String) */ + @Override public Resource createRelative(String relativePath) { String pathToUse = StringUtils.applyRelativePath(this.path, relativePath); return new ServletContextResource(this.servletContext, pathToUse); @@ -158,6 +162,7 @@ public class ServletContextResource extends AbstractResource implements ContextR * resource refers to. * @see org.springframework.util.StringUtils#getFilename(String) */ + @Override public String getFilename() { return StringUtils.getFilename(this.path); } @@ -178,6 +183,7 @@ public class ServletContextResource extends AbstractResource implements ContextR /** * This implementation compares the underlying ServletContext resource locations. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -193,6 +199,7 @@ public class ServletContextResource extends AbstractResource implements ContextR * This implementation returns the hash code of the underlying * ServletContext resource location. */ + @Override public int hashCode() { return this.path.hashCode(); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java index 6d25067a50e..a3a4a77286e 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java @@ -54,6 +54,7 @@ public class ServletContextResourceLoader extends DefaultResourceLoader { * This implementation supports file paths beneath the root of the web application. * @see ServletContextResource */ + @Override protected Resource getResourceByPath(String path) { return new ServletContextResource(this.servletContext, path); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java index 8ec9aa76fac..bbb066df2a5 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java @@ -67,6 +67,7 @@ public class ServletContextResourcePatternResolver extends PathMatchingResourceP * @see ServletContextResource * @see javax.servlet.ServletContext#getResourcePaths */ + @Override protected Set doFindPathMatchingFileResources(Resource rootDirResource, String subPattern) throws IOException { if (rootDirResource instanceof ServletContextResource) { ServletContextResource scResource = (ServletContextResource) rootDirResource; diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java index a6384fc8426..d06dc082736 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java @@ -117,6 +117,7 @@ public class ServletRequestHandledEvent extends RequestHandledEvent { } + @Override public String getShortDescription() { StringBuffer sb = new StringBuffer(); sb.append("url=[").append(getRequestUrl()).append("]; "); @@ -125,6 +126,7 @@ public class ServletRequestHandledEvent extends RequestHandledEvent { return sb.toString(); } + @Override public String getDescription() { StringBuffer sb = new StringBuffer(); sb.append("url=[").append(getRequestUrl()).append("]; "); @@ -135,6 +137,7 @@ public class ServletRequestHandledEvent extends RequestHandledEvent { return sb.toString(); } + @Override public String toString() { return "ServletRequestHandledEvent: " + getDescription(); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java index e03eb44196f..a8dd09dc490 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java @@ -132,6 +132,7 @@ public class StaticWebApplicationContext extends StaticApplicationContext /** * Register request/session scopes, a {@link ServletContextAwareProcessor}, etc. */ + @Override protected void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { beanFactory.registerScope(SCOPE_REQUEST, new RequestScope()); beanFactory.registerScope(SCOPE_SESSION, new SessionScope(false)); @@ -146,6 +147,7 @@ public class StaticWebApplicationContext extends StaticApplicationContext * This implementation supports file paths beneath the root of the ServletContext. * @see ServletContextResource */ + @Override protected Resource getResourceByPath(String path) { return new ServletContextResource(this.servletContext, path); } @@ -154,6 +156,7 @@ public class StaticWebApplicationContext extends StaticApplicationContext * This implementation supports pattern matching in unexpanded WARs too. * @see ServletContextResourcePatternResolver */ + @Override protected ResourcePatternResolver getResourcePatternResolver() { return new ServletContextResourcePatternResolver(this); } @@ -161,6 +164,7 @@ public class StaticWebApplicationContext extends StaticApplicationContext /** * Initialize the theme capability. */ + @Override protected void onRefresh() { this.themeSource = UiApplicationContextUtils.initThemeSource(this); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java index d544335739b..affe765ad0c 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java @@ -57,6 +57,7 @@ public abstract class WebApplicationObjectSupport extends ApplicationObjectSuppo * @see #getServletContext() * @see #getTempDir() */ + @Override protected boolean isContextRequired() { return true; } @@ -65,6 +66,7 @@ public abstract class WebApplicationObjectSupport extends ApplicationObjectSuppo * Calls {@link #initServletContext(javax.servlet.ServletContext)} if the * given ApplicationContext is a {@link WebApplicationContext}. */ + @Override protected void initApplicationContext(ApplicationContext context) { super.initApplicationContext(context); if (context instanceof WebApplicationContext) { diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java index 6d85039b71d..09e851c306e 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java @@ -77,6 +77,7 @@ public class XmlWebApplicationContext extends AbstractRefreshableWebApplicationC * @see #initBeanDefinitionReader * @see #loadBeanDefinitions */ + @Override protected void loadBeanDefinitions(DefaultListableBeanFactory beanFactory) throws IOException { // Create a new XmlBeanDefinitionReader for the given BeanFactory. XmlBeanDefinitionReader beanDefinitionReader = new XmlBeanDefinitionReader(beanFactory); @@ -131,6 +132,7 @@ public class XmlWebApplicationContext extends AbstractRefreshableWebApplicationC * and "/WEB-INF/test-servlet.xml" for a context with the namespace "test-servlet" * (like for a DispatcherServlet instance with the servlet-name "test"). */ + @Override protected String[] getDefaultConfigLocations() { if (getNamespace() != null) { return new String[] {DEFAULT_CONFIG_LOCATION_PREFIX + getNamespace() + DEFAULT_CONFIG_LOCATION_SUFFIX}; diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java b/org.springframework.web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java index e801ed44856..be0693a5b30 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java +++ b/org.springframework.web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java @@ -147,6 +147,7 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter * @see #beforeRequest * @see #afterRequest */ + @Override protected void doFilterInternal( HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java b/org.springframework.web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java index 14cf0701344..277170f12b0 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java +++ b/org.springframework.web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java @@ -83,6 +83,7 @@ public class CharacterEncodingFilter extends OncePerRequestFilter { } + @Override protected void doFilterInternal( HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java b/org.springframework.web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java index 32fc88cd39a..191a510fbf4 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java +++ b/org.springframework.web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java @@ -36,6 +36,7 @@ public class CommonsRequestLoggingFilter extends AbstractRequestLoggingFilter { /** * Writes a log message before the request is processed. */ + @Override protected void beforeRequest(HttpServletRequest request, String message) { if (logger.isDebugEnabled()) { logger.debug(message); @@ -45,6 +46,7 @@ public class CommonsRequestLoggingFilter extends AbstractRequestLoggingFilter { /** * Writes a log message after the request is processed. */ + @Override protected void afterRequest(HttpServletRequest request, String message) { if (logger.isDebugEnabled()) { logger.debug(message); diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java b/org.springframework.web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java index ff64b2c54a8..c870f5b3fd1 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java +++ b/org.springframework.web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java @@ -130,6 +130,7 @@ public class DelegatingFilterProxy extends GenericFilterBean { } + @Override protected void initFilterBean() throws ServletException { // If no target bean name specified, use filter name. if (this.targetBeanName == null) { @@ -167,6 +168,7 @@ public class DelegatingFilterProxy extends GenericFilterBean { invokeDelegate(delegateToUse, request, response, filterChain); } + @Override public void destroy() { Filter delegateToUse = null; synchronized (this.delegateMonitor) { diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/Log4jNestedDiagnosticContextFilter.java b/org.springframework.web/src/main/java/org/springframework/web/filter/Log4jNestedDiagnosticContextFilter.java index 85453393d4c..982552fead7 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/filter/Log4jNestedDiagnosticContextFilter.java +++ b/org.springframework.web/src/main/java/org/springframework/web/filter/Log4jNestedDiagnosticContextFilter.java @@ -47,6 +47,7 @@ public class Log4jNestedDiagnosticContextFilter extends AbstractRequestLoggingFi * Logs the before-request message through Log4J and * adds a message the Log4J NDC before the request is processed. */ + @Override protected void beforeRequest(HttpServletRequest request, String message) { if (log4jLogger.isDebugEnabled()) { log4jLogger.debug(message); @@ -69,6 +70,7 @@ public class Log4jNestedDiagnosticContextFilter extends AbstractRequestLoggingFi * Removes the log message from the Log4J NDC after the request is processed * and logs the after-request message through Log4J. */ + @Override protected void afterRequest(HttpServletRequest request, String message) { NDC.pop(); if (NDC.getDepth() == 0) { diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/RequestContextFilter.java b/org.springframework.web/src/main/java/org/springframework/web/filter/RequestContextFilter.java index ce2a31dd12b..499bab42bd5 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/filter/RequestContextFilter.java +++ b/org.springframework.web/src/main/java/org/springframework/web/filter/RequestContextFilter.java @@ -69,6 +69,7 @@ public class RequestContextFilter extends OncePerRequestFilter { } + @Override protected void doFilterInternal( HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java b/org.springframework.web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java index fef384d4734..23982784e91 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java +++ b/org.springframework.web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java @@ -36,6 +36,7 @@ public class ServletContextRequestLoggingFilter extends AbstractRequestLoggingFi /** * Writes a log message before the request is processed. */ + @Override protected void beforeRequest(HttpServletRequest request, String message) { getServletContext().log(message); } @@ -43,6 +44,7 @@ public class ServletContextRequestLoggingFilter extends AbstractRequestLoggingFi /** * Writes a log message after the request is processed. */ + @Override protected void afterRequest(HttpServletRequest request, String message) { getServletContext().log(message); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java b/org.springframework.web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java index 1baf8adaf6d..ae3a888f214 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java +++ b/org.springframework.web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java @@ -68,6 +68,7 @@ public abstract class DecoratingNavigationHandler extends NavigationHandler { * NavigationHandler as argument. * @see #handleNavigation(javax.faces.context.FacesContext, String, String, javax.faces.application.NavigationHandler) */ + @Override public final void handleNavigation(FacesContext facesContext, String fromAction, String outcome) { handleNavigation(facesContext, fromAction, outcome, this.decoratedNavigationHandler); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java b/org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java index b984ab091f0..6686c3ded50 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java +++ b/org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java @@ -105,6 +105,7 @@ public class DelegatingNavigationHandlerProxy extends NavigationHandler { * as argument will be used. Else, the standard handleNavigation * method will be called. */ + @Override public void handleNavigation(FacesContext facesContext, String fromAction, String outcome) { NavigationHandler handler = getDelegate(facesContext); if (handler instanceof DecoratingNavigationHandler) { diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java b/org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java index c2dc1acf781..75ee530d965 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java @@ -103,6 +103,7 @@ public class DelegatingVariableResolver extends VariableResolver { * Delegate to the original VariableResolver first, then try to * resolve the variable as Spring bean in the root WebApplicationContext. */ + @Override public Object resolveVariable(FacesContext facesContext, String name) throws EvaluationException { Object value = resolveOriginal(facesContext, name); if (value != null) { diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java b/org.springframework.web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java index c51a38e485f..fb174458c62 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java @@ -38,6 +38,7 @@ public class SpringBeanVariableResolver extends DelegatingVariableResolver { super(originalVariableResolver); } + @Override public Object resolveVariable(FacesContext facesContext, String name) throws EvaluationException { Object bean = resolveSpringBean(facesContext, name); if (bean != null) { diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java b/org.springframework.web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java index 3c8fd8d2ff2..3005e37df1a 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java @@ -87,6 +87,7 @@ public class WebApplicationContextVariableResolver extends VariableResolver { *

If no WebApplicationContext is available, all requests * will be delegated to the original VariableResolver. */ + @Override public Object resolveVariable(FacesContext context, String name) throws EvaluationException { Object value = null; if (WEB_APPLICATION_CONTEXT_VARIABLE_NAME.equals(name)) { diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java b/org.springframework.web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java index 2a7a4de2628..7fa88a5a6de 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java @@ -74,6 +74,7 @@ public class SpringBeanFacesELResolver extends SpringBeanELResolver { * @param elContext the current JSF ELContext * @return the Spring BeanFactory (never null) */ + @Override protected BeanFactory getBeanFactory(ELContext elContext) { return getWebApplicationContext(elContext); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java b/org.springframework.web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java index 018448705b8..bf87a088f18 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java @@ -67,6 +67,7 @@ public class WebApplicationContextFacesELResolver extends ELResolver { protected final Log logger = LogFactory.getLog(getClass()); + @Override public Object getValue(ELContext elContext, Object base, Object property) throws ELException { if (base != null) { if (base instanceof WebApplicationContext) { @@ -103,6 +104,7 @@ public class WebApplicationContextFacesELResolver extends ELResolver { return null; } + @Override public Class getType(ELContext elContext, Object base, Object property) throws ELException { if (base != null) { if (base instanceof WebApplicationContext) { @@ -139,9 +141,11 @@ public class WebApplicationContextFacesELResolver extends ELResolver { return null; } + @Override public void setValue(ELContext elContext, Object base, Object property, Object value) throws ELException { } + @Override public boolean isReadOnly(ELContext elContext, Object base, Object property) throws ELException { if (base instanceof WebApplicationContext) { elContext.setPropertyResolved(true); @@ -150,10 +154,12 @@ public class WebApplicationContextFacesELResolver extends ELResolver { return false; } + @Override public Iterator getFeatureDescriptors(ELContext elContext, Object base) { return null; } + @Override public Class getCommonPropertyType(ELContext elContext, Object base) { return Object.class; } diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java b/org.springframework.web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java index 1f01f158492..1763bd6a88c 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java +++ b/org.springframework.web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java @@ -440,6 +440,7 @@ public abstract class ExpressionEvaluationUtils { this.hashCode = this.value.hashCode() * 29 + this.resultClass.hashCode(); } + @Override public boolean equals(Object obj) { if (!(obj instanceof ExpressionCacheKey)) { return false; @@ -448,6 +449,7 @@ public abstract class ExpressionEvaluationUtils { return (this.value.equals(other.value) && this.resultClass.equals(other.resultClass)); } + @Override public int hashCode() { return this.hashCode; } diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/Log4jConfigServlet.java b/org.springframework.web/src/main/java/org/springframework/web/util/Log4jConfigServlet.java index 841fb9e6e5a..8494364b192 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/util/Log4jConfigServlet.java +++ b/org.springframework.web/src/main/java/org/springframework/web/util/Log4jConfigServlet.java @@ -53,10 +53,12 @@ import javax.servlet.http.HttpServletResponse; */ public class Log4jConfigServlet extends HttpServlet { + @Override public void init() { Log4jWebConfigurer.initLogging(getServletContext()); } + @Override public void destroy() { Log4jWebConfigurer.shutdownLogging(getServletContext()); } @@ -67,6 +69,7 @@ public class Log4jConfigServlet extends HttpServlet { * ever be created in web.xml. That's why a correctly invoked Servlet 2.3 * listener is much more appropriate for initialization work ;-) */ + @Override public void service(HttpServletRequest request, HttpServletResponse response) throws IOException { getServletContext().log( "Attempt to call service method on Log4jConfigServlet as [" + @@ -74,6 +77,7 @@ public class Log4jConfigServlet extends HttpServlet { response.sendError(HttpServletResponse.SC_BAD_REQUEST); } + @Override public String getServletInfo() { return "Log4jConfigServlet for Servlet API 2.3 " + "(deprecated in favor of Log4jConfigListener for Servlet API 2.4)"; diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/NestedServletException.java b/org.springframework.web/src/main/java/org/springframework/web/util/NestedServletException.java index 32f1dca4ac2..cecb399c40b 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/util/NestedServletException.java +++ b/org.springframework.web/src/main/java/org/springframework/web/util/NestedServletException.java @@ -71,6 +71,7 @@ public class NestedServletException extends ServletException { * Return the detail message, including the message from the nested exception * if there is one. */ + @Override public String getMessage() { return NestedExceptionUtils.buildMessage(super.getMessage(), getCause()); } diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java index 59a3917919d..3bd71840154 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java +++ b/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java @@ -45,18 +45,21 @@ public class UrlPathHelper { * @deprecated as of Spring 2.0, in favor of WebUtils.INCLUDE_REQUEST_URI_ATTRIBUTE * @see org.springframework.web.util.WebUtils#INCLUDE_REQUEST_URI_ATTRIBUTE */ + @Deprecated public static final String INCLUDE_URI_REQUEST_ATTRIBUTE = WebUtils.INCLUDE_REQUEST_URI_ATTRIBUTE; /** * @deprecated as of Spring 2.0, in favor of WebUtils.INCLUDE_CONTEXT_PATH_ATTRIBUTE * @see org.springframework.web.util.WebUtils#INCLUDE_CONTEXT_PATH_ATTRIBUTE */ + @Deprecated public static final String INCLUDE_CONTEXT_PATH_REQUEST_ATTRIBUTE = WebUtils.INCLUDE_CONTEXT_PATH_ATTRIBUTE; /** * @deprecated as of Spring 2.0, in favor of WebUtils.INCLUDE_SERVLET_PATH_ATTRIBUTE * @see org.springframework.web.util.WebUtils#INCLUDE_SERVLET_PATH_ATTRIBUTE */ + @Deprecated public static final String INCLUDE_SERVLET_PATH_REQUEST_ATTRIBUTE = WebUtils.INCLUDE_SERVLET_PATH_ATTRIBUTE;