Add @Override annotations to test sources

Issue: SPR-10129

spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java

@@ -54,10 +54,12 @@ public class DelegatingServletInputStream extends ServletInputStream {
 	}
 
 
+	@Override
 	public int read() throws IOException {
 		return this.sourceStream.read();
 	}
 
+	@Override
 	public void close() throws IOException {
 		super.close();
 		this.sourceStream.close();

spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java

@@ -54,15 +54,18 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 	}
 
 
+	@Override
 	public void write(int b) throws IOException {
 		this.targetStream.write(b);
 	}
 
+	@Override
 	public void flush() throws IOException {
 		super.flush();
 		this.targetStream.flush();
 	}
 
+	@Override
 	public void close() throws IOException {
 		super.close();
 		this.targetStream.close();

spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java

@@ -116,6 +116,7 @@ public class MockFilterChain implements FilterChain {
 	 * Invoke registered {@link javax.servlet.Filter}s and/or {@link javax.servlet.Servlet} also saving the
 	 * request and response.
 	 */
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
@@ -159,15 +160,18 @@ public class MockFilterChain implements FilterChain {
 			this.delegateServlet = servlet;
 		}
 
+		@Override
 		public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
 				throws IOException, ServletException {
 
 			this.delegateServlet.service(request, response);
 		}
 
+		@Override
 		public void init(FilterConfig filterConfig) throws ServletException {
 		}
 
+		@Override
 		public void destroy() {
 		}
 

spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java

@@ -79,10 +79,12 @@ public class MockFilterConfig implements FilterConfig {
 	}
 
 
+	@Override
 	public String getFilterName() {
 		return filterName;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return servletContext;
 	}
@@ -92,11 +94,13 @@ public class MockFilterConfig implements FilterConfig {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}

spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java

@@ -282,20 +282,24 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	// ServletRequest interface
 	// ---------------------------------------------------------------------
 
+	@Override
 	public Object getAttribute(String name) {
 		checkActive();
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		checkActive();
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
 
+	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
 		updateContentTypeHeader();
@@ -315,6 +319,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.content = content;
 	}
 
+	@Override
 	public int getContentLength() {
 		return (this.content != null ? this.content.length : -1);
 	}
@@ -331,10 +336,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public ServletInputStream getInputStream() {
 		if (this.content != null) {
 			return new DelegatingServletInputStream(new ByteArrayInputStream(this.content));
@@ -455,21 +462,25 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.parameters.clear();
 	}
 
+	@Override
 	public String getParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		String[] arr = this.parameters.get(name);
 		return (arr != null && arr.length > 0 ? arr[0] : null);
 	}
 
+	@Override
 	public Enumeration<String> getParameterNames() {
 		return Collections.enumeration(this.parameters.keySet());
 	}
 
+	@Override
 	public String[] getParameterValues(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.parameters.get(name);
 	}
 
+	@Override
 	public Map<String, String[]> getParameterMap() {
 		return Collections.unmodifiableMap(this.parameters);
 	}
@@ -478,6 +489,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.protocol = protocol;
 	}
 
+	@Override
 	public String getProtocol() {
 		return this.protocol;
 	}
@@ -486,6 +498,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.scheme = scheme;
 	}
 
+	@Override
 	public String getScheme() {
 		return this.scheme;
 	}
@@ -494,6 +507,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.serverName = serverName;
 	}
 
+	@Override
 	public String getServerName() {
 		return this.serverName;
 	}
@@ -502,10 +516,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.serverPort = serverPort;
 	}
 
+	@Override
 	public int getServerPort() {
 		return this.serverPort;
 	}
 
+	@Override
 	public BufferedReader getReader() throws UnsupportedEncodingException {
 		if (this.content != null) {
 			InputStream sourceStream = new ByteArrayInputStream(this.content);
@@ -522,6 +538,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteAddr = remoteAddr;
 	}
 
+	@Override
 	public String getRemoteAddr() {
 		return this.remoteAddr;
 	}
@@ -530,10 +547,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteHost = remoteHost;
 	}
 
+	@Override
 	public String getRemoteHost() {
 		return this.remoteHost;
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		checkActive();
 		Assert.notNull(name, "Attribute name must not be null");
@@ -545,6 +564,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		checkActive();
 		Assert.notNull(name, "Attribute name must not be null");
@@ -579,10 +599,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.locales.addAll(locales);
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locales.get(0);
 	}
 
+	@Override
 	public Enumeration<Locale> getLocales() {
 		return Collections.enumeration(this.locales);
 	}
@@ -591,14 +613,17 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.secure = secure;
 	}
 
+	@Override
 	public boolean isSecure() {
 		return this.secure;
 	}
 
+	@Override
 	public RequestDispatcher getRequestDispatcher(String path) {
 		return new MockRequestDispatcher(path);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		return this.servletContext.getRealPath(path);
 	}
@@ -607,6 +632,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remotePort = remotePort;
 	}
 
+	@Override
 	public int getRemotePort() {
 		return this.remotePort;
 	}
@@ -615,6 +641,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localName = localName;
 	}
 
+	@Override
 	public String getLocalName() {
 		return this.localName;
 	}
@@ -623,6 +650,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localAddr = localAddr;
 	}
 
+	@Override
 	public String getLocalAddr() {
 		return this.localAddr;
 	}
@@ -631,6 +659,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localPort = localPort;
 	}
 
+	@Override
 	public int getLocalPort() {
 		return this.localPort;
 	}
@@ -643,6 +672,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.authType = authType;
 	}
 
+	@Override
 	public String getAuthType() {
 		return this.authType;
 	}
@@ -651,6 +681,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.cookies = cookies;
 	}
 
+	@Override
 	public Cookie[] getCookies() {
 		return this.cookies;
 	}
@@ -699,6 +730,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public long getDateHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		Object value = (header != null ? header.getValue() : null);
@@ -717,20 +749,24 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public String getHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		return (header != null ? header.getStringValue() : null);
 	}
 
+	@Override
 	public Enumeration<String> getHeaders(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList<String>());
 	}
 
+	@Override
 	public Enumeration<String> getHeaderNames() {
 		return Collections.enumeration(this.headers.keySet());
 	}
 
+	@Override
 	public int getIntHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		Object value = (header != null ? header.getValue() : null);
@@ -752,6 +788,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.method = method;
 	}
 
+	@Override
 	public String getMethod() {
 		return this.method;
 	}
@@ -760,10 +797,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.pathInfo = pathInfo;
 	}
 
+	@Override
 	public String getPathInfo() {
 		return this.pathInfo;
 	}
 
+	@Override
 	public String getPathTranslated() {
 		return (this.pathInfo != null ? getRealPath(this.pathInfo) : null);
 	}
@@ -772,6 +811,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.contextPath = contextPath;
 	}
 
+	@Override
 	public String getContextPath() {
 		return this.contextPath;
 	}
@@ -780,6 +820,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.queryString = queryString;
 	}
 
+	@Override
 	public String getQueryString() {
 		return this.queryString;
 	}
@@ -788,6 +829,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteUser = remoteUser;
 	}
 
+	@Override
 	public String getRemoteUser() {
 		return this.remoteUser;
 	}
@@ -796,6 +838,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.userRoles.add(role);
 	}
 
+	@Override
 	public boolean isUserInRole(String role) {
 		return (this.userRoles.contains(role) || (this.servletContext instanceof MockServletContext && ((MockServletContext) this.servletContext).getDeclaredRoles().contains(
 			role)));
@@ -805,6 +848,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.userPrincipal = userPrincipal;
 	}
 
+	@Override
 	public Principal getUserPrincipal() {
 		return this.userPrincipal;
 	}
@@ -813,6 +857,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionId = requestedSessionId;
 	}
 
+	@Override
 	public String getRequestedSessionId() {
 		return this.requestedSessionId;
 	}
@@ -821,10 +866,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestURI = requestURI;
 	}
 
+	@Override
 	public String getRequestURI() {
 		return this.requestURI;
 	}
 
+	@Override
 	public StringBuffer getRequestURL() {
 		StringBuffer url = new StringBuffer(this.scheme);
 		url.append("://").append(this.serverName).append(':').append(this.serverPort);
@@ -836,6 +883,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.servletPath = servletPath;
 	}
 
+	@Override
 	public String getServletPath() {
 		return this.servletPath;
 	}
@@ -848,6 +896,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public HttpSession getSession(boolean create) {
 		checkActive();
 		// Reset session if invalidated.
@@ -861,6 +910,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		return this.session;
 	}
 
+	@Override
 	public HttpSession getSession() {
 		return getSession(true);
 	}
@@ -869,6 +919,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdValid = requestedSessionIdValid;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdValid() {
 		return this.requestedSessionIdValid;
 	}
@@ -877,6 +928,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdFromCookie = requestedSessionIdFromCookie;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromCookie() {
 		return this.requestedSessionIdFromCookie;
 	}
@@ -885,10 +937,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdFromURL = requestedSessionIdFromURL;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromURL() {
 		return this.requestedSessionIdFromURL;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromUrl() {
 		return isRequestedSessionIdFromURL();
 	}

spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java

@@ -136,6 +136,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.writerAccessAllowed;
 	}
 
+	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
 		this.charset = true;
@@ -152,10 +153,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
 
+	@Override
 	public ServletOutputStream getOutputStream() {
 		if (!this.outputStreamAccessAllowed) {
 			throw new IllegalStateException("OutputStream access not allowed");
@@ -163,6 +166,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.outputStream;
 	}
 
+	@Override
 	public PrintWriter getWriter() throws UnsupportedEncodingException {
 		if (!this.writerAccessAllowed) {
 			throw new IllegalStateException("Writer access not allowed");
@@ -186,6 +190,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 				this.content.toString(this.characterEncoding) : this.content.toString();
 	}
 
+	@Override
 	public void setContentLength(int contentLength) {
 		this.contentLength = contentLength;
 		doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true);
@@ -195,6 +200,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.contentLength;
 	}
 
+	@Override
 	public void setContentType(String contentType) {
 		this.contentType = contentType;
 		if (contentType != null) {
@@ -208,22 +214,27 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public void setBufferSize(int bufferSize) {
 		this.bufferSize = bufferSize;
 	}
 
+	@Override
 	public int getBufferSize() {
 		return this.bufferSize;
 	}
 
+	@Override
 	public void flushBuffer() {
 		setCommitted(true);
 	}
 
+	@Override
 	public void resetBuffer() {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot reset buffer - response is already committed");
@@ -242,10 +253,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.committed = committed;
 	}
 
+	@Override
 	public boolean isCommitted() {
 		return this.committed;
 	}
 
+	@Override
 	public void reset() {
 		resetBuffer();
 		this.characterEncoding = null;
@@ -258,10 +271,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.errorMessage = null;
 	}
 
+	@Override
 	public void setLocale(Locale locale) {
 		this.locale = locale;
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locale;
 	}
@@ -271,6 +286,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	// HttpServletResponse interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void addCookie(Cookie cookie) {
 		Assert.notNull(cookie, "Cookie must not be null");
 		this.cookies.add(cookie);
@@ -290,6 +306,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return null;
 	}
 
+	@Override
 	public boolean containsHeader(String name) {
 		return (HeaderValueHolder.getByName(this.headers, name) != null);
 	}
@@ -365,6 +382,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * The default implementation returns the given URL String as-is.
 	 * <p>Can be overridden in subclasses, appending a session id or the like.
 	 */
+	@Override
 	public String encodeURL(String url) {
 		return url;
 	}
@@ -377,18 +395,22 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * override the common {@link #encodeURL} method instead, applying
 	 * to redirect URLs as well as to general URLs.
 	 */
+	@Override
 	public String encodeRedirectURL(String url) {
 		return encodeURL(url);
 	}
 
+	@Override
 	public String encodeUrl(String url) {
 		return encodeURL(url);
 	}
 
+	@Override
 	public String encodeRedirectUrl(String url) {
 		return encodeRedirectURL(url);
 	}
 
+	@Override
 	public void sendError(int status, String errorMessage) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot set error status - response is already committed");
@@ -398,6 +420,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		setCommitted(true);
 	}
 
+	@Override
 	public void sendError(int status) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot set error status - response is already committed");
@@ -406,6 +429,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		setCommitted(true);
 	}
 
+	@Override
 	public void sendRedirect(String url) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot send redirect - response is already committed");
@@ -420,26 +444,32 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return getHeader(LOCATION_HEADER);
 	}
 
+	@Override
 	public void setDateHeader(String name, long value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addDateHeader(String name, long value) {
 		addHeaderValue(name, value);
 	}
 
+	@Override
 	public void setHeader(String name, String value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addHeader(String name, String value) {
 		addHeaderValue(name, value);
 	}
 
+	@Override
 	public void setIntHeader(String name, int value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addIntHeader(String name, int value) {
 		addHeaderValue(name, value);
 	}
@@ -487,10 +517,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public void setStatus(int status) {
 		this.status = status;
 	}
 
+	@Override
 	public void setStatus(int status, String errorMessage) {
 		this.status = status;
 		this.errorMessage = errorMessage;
@@ -553,12 +585,14 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			super(out);
 		}
 
+		@Override
 		public void write(int b) throws IOException {
 			super.write(b);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void flush() throws IOException {
 			super.flush();
 			setCommitted(true);
@@ -576,24 +610,28 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			super(out, true);
 		}
 
+		@Override
 		public void write(char buf[], int off, int len) {
 			super.write(buf, off, len);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void write(String s, int off, int len) {
 			super.write(s, off, len);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void write(int c) {
 			super.write(c);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void flush() {
 			super.flush();
 			setCommitted(true);

spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java

@@ -98,10 +98,12 @@ public class MockHttpSession implements HttpSession {
 		this.id = (id != null ? id : Integer.toString(nextId++));
 	}
 
+	@Override
 	public long getCreationTime() {
 		return this.creationTime;
 	}
 
+	@Override
 	public String getId() {
 		return this.id;
 	}
@@ -111,43 +113,53 @@ public class MockHttpSession implements HttpSession {
 		this.isNew = false;
 	}
 
+	@Override
 	public long getLastAccessedTime() {
 		return this.lastAccessedTime;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
 
+	@Override
 	public void setMaxInactiveInterval(int interval) {
 		this.maxInactiveInterval = interval;
 	}
 
+	@Override
 	public int getMaxInactiveInterval() {
 		return this.maxInactiveInterval;
 	}
 
+	@Override
 	public HttpSessionContext getSessionContext() {
 		throw new UnsupportedOperationException("getSessionContext");
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Object getValue(String name) {
 		return getAttribute(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public String[] getValueNames() {
 		return this.attributes.keySet().toArray(new String[this.attributes.size()]);
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -161,10 +173,12 @@ public class MockHttpSession implements HttpSession {
 		}
 	}
 
+	@Override
 	public void putValue(String name, Object value) {
 		setAttribute(name, value);
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		Object value = this.attributes.remove(name);
@@ -173,6 +187,7 @@ public class MockHttpSession implements HttpSession {
 		}
 	}
 
+	@Override
 	public void removeValue(String name) {
 		removeAttribute(name);
 	}
@@ -197,6 +212,7 @@ public class MockHttpSession implements HttpSession {
 	 *
 	 * @throws IllegalStateException if this method is called on an already invalidated session
 	 */
+	@Override
 	public void invalidate() {
 		if (this.invalid) {
 			throw new IllegalStateException("The session has already been invalidated");
@@ -215,6 +231,7 @@ public class MockHttpSession implements HttpSession {
 		this.isNew = value;
 	}
 
+	@Override
 	public boolean isNew() {
 		return this.isNew;
 	}

spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java

@@ -55,6 +55,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
 	}
 
 
+	@Override
 	public void forward(ServletRequest request, ServletResponse response) {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
@@ -67,6 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
 		}
 	}
 
+	@Override
 	public void include(ServletRequest request, ServletResponse response) {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");

spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java

@@ -78,10 +78,12 @@ public class MockServletConfig implements ServletConfig {
 	}
 
 
+	@Override
 	public String getServletName() {
 		return this.servletName;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
@@ -91,11 +93,13 @@ public class MockServletConfig implements ServletConfig {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}

spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java

@@ -195,6 +195,7 @@ public class MockServletContext implements ServletContext {
 	}
 
 	/* This is a Servlet API 2.5 method. */
+	@Override
 	public String getContextPath() {
 		return this.contextPath;
 	}
@@ -203,6 +204,7 @@ public class MockServletContext implements ServletContext {
 		this.contexts.put(contextPath, context);
 	}
 
+	@Override
 	public ServletContext getContext(String contextPath) {
 		if (this.contextPath.equals(contextPath)) {
 			return this;
@@ -214,6 +216,7 @@ public class MockServletContext implements ServletContext {
 		this.majorVersion = majorVersion;
 	}
 
+	@Override
 	public int getMajorVersion() {
 		return this.majorVersion;
 	}
@@ -222,6 +225,7 @@ public class MockServletContext implements ServletContext {
 		this.minorVersion = minorVersion;
 	}
 
+	@Override
 	public int getMinorVersion() {
 		return this.minorVersion;
 	}
@@ -242,10 +246,12 @@ public class MockServletContext implements ServletContext {
 		return this.effectiveMinorVersion;
 	}
 
+	@Override
 	public String getMimeType(String filePath) {
 		return MimeTypeResolver.getMimeType(filePath);
 	}
 
+	@Override
 	public Set<String> getResourcePaths(String path) {
 		String actualPath = (path.endsWith("/") ? path : path + "/");
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath));
@@ -271,6 +277,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public URL getResource(String path) throws MalformedURLException {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		if (!resource.exists()) {
@@ -288,6 +295,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public InputStream getResourceAsStream(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		if (!resource.exists()) {
@@ -302,6 +310,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public RequestDispatcher getRequestDispatcher(String path) {
 		if (!path.startsWith("/")) {
 			throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'");
@@ -309,6 +318,7 @@ public class MockServletContext implements ServletContext {
 		return new MockRequestDispatcher(path);
 	}
 
+	@Override
 	public RequestDispatcher getNamedDispatcher(String path) {
 		return this.namedRequestDispatchers.get(path);
 	}
@@ -366,30 +376,37 @@ public class MockServletContext implements ServletContext {
 		registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName));
 	}
 
+	@Override
 	public Servlet getServlet(String name) {
 		return null;
 	}
 
+	@Override
 	public Enumeration<Servlet> getServlets() {
 		return Collections.enumeration(new HashSet<Servlet>());
 	}
 
+	@Override
 	public Enumeration<String> getServletNames() {
 		return Collections.enumeration(new HashSet<String>());
 	}
 
+	@Override
 	public void log(String message) {
 		logger.info(message);
 	}
 
+	@Override
 	public void log(Exception ex, String message) {
 		logger.info(message, ex);
 	}
 
+	@Override
 	public void log(String message, Throwable ex) {
 		logger.info(message, ex);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -401,15 +418,18 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public String getServerInfo() {
 		return "MockServletContext";
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
@@ -428,15 +448,18 @@ public class MockServletContext implements ServletContext {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return new Vector<String>(this.attributes.keySet()).elements();
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -447,6 +470,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		this.attributes.remove(name);
@@ -456,6 +480,7 @@ public class MockServletContext implements ServletContext {
 		this.servletContextName = servletContextName;
 	}
 
+	@Override
 	public String getServletContextName() {
 		return this.servletContextName;
 	}

spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java

@@ -73,6 +73,7 @@ public class PassThroughFilterChain implements FilterChain {
 	/**
 	 * Pass the call on to the Filter/Servlet.
 	 */
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response) throws ServletException, IOException {
 		if (this.filter != null) {
 			this.filter.doFilter(request, response, this.nextFilterChain);

spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java

@@ -128,6 +128,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -186,6 +187,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					throw new RuntimeException("application exception");
@@ -239,6 +241,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
@@ -299,8 +302,10 @@ public class HibernateTransactionManagerTests extends TestCase {
 		l.add("test");
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				return tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
 						session.flush();
@@ -348,8 +353,10 @@ public class HibernateTransactionManagerTests extends TestCase {
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					return tt.execute(new TransactionCallback() {
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 							throw new RuntimeException("application exception");
 						}
@@ -400,8 +407,10 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					return tt.execute(new TransactionCallback() {
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 							status.setRollbackOnly();
 							return null;
@@ -471,12 +480,14 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				final SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf);
 				assertTrue("Has thread session", holder != null);
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
 						assertTrue("Not enclosing session", session != holder.getSession());
@@ -538,6 +549,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf);
 				assertTrue("Has thread session", holder != null);
@@ -545,6 +557,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
 				tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 						assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -596,6 +609,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy));
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -668,6 +682,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -676,6 +691,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 				Session session = sfProxy.openSession();
 				assertSame(session1, session);
 				tt2.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 						assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -752,6 +768,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -817,6 +834,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					return l;
@@ -890,6 +908,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -970,12 +989,14 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				public void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 					SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(sf);
 					assertEquals(tx1, sessionHolder.getTransaction());
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						public void doInTransactionWithoutResult(TransactionStatus status) {
 							status.setRollbackOnly();
 							Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
@@ -996,6 +1017,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Not marked rollback-only", !sessionHolder.isRollbackOnly());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			public void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1066,9 +1088,11 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				public void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						public void doInTransactionWithoutResult(TransactionStatus status) {
 							status.setRollbackOnly();
 							Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
@@ -1086,6 +1110,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			public void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
@@ -1176,6 +1201,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1185,6 +1211,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 				}
 				else {
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) {
 							assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 							assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1233,6 +1260,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1275,6 +1303,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session));
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1327,6 +1356,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1370,6 +1400,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			public void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -1385,6 +1416,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		txControl.verify();
 	}
 
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());