Repository: commons-fileupload Updated Branches: refs/heads/master c4e7b3084 -> 3ac3b9c39
Add missing '@Override' annotations. Project: http://git-wip-us.apache.org/repos/asf/commons-fileupload/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-fileupload/commit/3ac3b9c3 Tree: http://git-wip-us.apache.org/repos/asf/commons-fileupload/tree/3ac3b9c3 Diff: http://git-wip-us.apache.org/repos/asf/commons-fileupload/diff/3ac3b9c3 Branch: refs/heads/master Commit: 3ac3b9c39c2637fd92ce89caf066e3058bb17d3c Parents: c4e7b30 Author: Gary Gregory <[email protected]> Authored: Mon May 21 08:20:47 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Mon May 21 08:20:47 2018 -0600 ---------------------------------------------------------------------- .../commons/fileupload/FileUploadBase.java | 9 ++++ .../commons/fileupload/MultipartStream.java | 1 + .../commons/fileupload/disk/DiskFileItem.java | 17 ++++++ .../fileupload/disk/DiskFileItemFactory.java | 1 + .../portlet/PortletRequestContext.java | 5 ++ .../fileupload/servlet/FileCleanerCleanup.java | 2 + .../servlet/ServletRequestContext.java | 5 ++ .../fileupload/util/FileItemHeadersImpl.java | 3 ++ .../fileupload/util/LimitedInputStream.java | 1 + .../fileupload/MockHttpServletRequest.java | 54 ++++++++++++++++++++ .../fileupload/ProgressListenerTest.java | 1 + 11 files changed, 99 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/3ac3b9c3/src/main/java/org/apache/commons/fileupload/FileUploadBase.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/fileupload/FileUploadBase.java b/src/main/java/org/apache/commons/fileupload/FileUploadBase.java index f7cf478..13e8791 100644 --- a/src/main/java/org/apache/commons/fileupload/FileUploadBase.java +++ b/src/main/java/org/apache/commons/fileupload/FileUploadBase.java @@ -802,6 +802,7 @@ public abstract class FileUploadBase { * * @return Content type, if known, or null. */ + @Override public String getContentType() { return contentType; } @@ -811,6 +812,7 @@ public abstract class FileUploadBase { * * @return Field name. */ + @Override public String getFieldName() { return fieldName; } @@ -824,6 +826,7 @@ public abstract class FileUploadBase { * use the file name anyways, catch the exception and use * InvalidFileNameException#getName(). */ + @Override public String getName() { return Streams.checkFileName(name); } @@ -834,6 +837,7 @@ public abstract class FileUploadBase { * @return True, if the item is a form field, * otherwise false. */ + @Override public boolean isFormField() { return formField; } @@ -845,6 +849,7 @@ public abstract class FileUploadBase { * @return Opened input stream. * @throws IOException An I/O error occurred. */ + @Override public InputStream openStream() throws IOException { if (opened) { throw new IllegalStateException( @@ -870,6 +875,7 @@ public abstract class FileUploadBase { * * @return The items header object */ + @Override public FileItemHeaders getHeaders() { return headers; } @@ -879,6 +885,7 @@ public abstract class FileUploadBase { * * @param pHeaders The items header object */ + @Override public void setHeaders(FileItemHeaders pHeaders) { headers = pHeaders; } @@ -1099,6 +1106,7 @@ public abstract class FileUploadBase { * @return True, if one or more additional file items * are available, otherwise false. */ + @Override public boolean hasNext() throws FileUploadException, IOException { if (eof) { return false; @@ -1125,6 +1133,7 @@ public abstract class FileUploadBase { * @return FileItemStream instance, which provides * access to the next file item. */ + @Override public FileItemStream next() throws FileUploadException, IOException { if (eof || (!itemValid && !hasNext())) { throw new NoSuchElementException(); http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/3ac3b9c3/src/main/java/org/apache/commons/fileupload/MultipartStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/fileupload/MultipartStream.java b/src/main/java/org/apache/commons/fileupload/MultipartStream.java index 38d57ff..70985bd 100644 --- a/src/main/java/org/apache/commons/fileupload/MultipartStream.java +++ b/src/main/java/org/apache/commons/fileupload/MultipartStream.java @@ -1051,6 +1051,7 @@ public class MultipartStream { * * @return True, if the stream is closed, otherwise false. */ + @Override public boolean isClosed() { return closed; } http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/3ac3b9c3/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java b/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java index b698a30..e5e3bf9 100644 --- a/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java +++ b/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java @@ -199,6 +199,7 @@ public class DiskFileItem * * @throws IOException if an error occurs. */ + @Override public InputStream getInputStream() throws IOException { if (!isInMemory()) { @@ -218,6 +219,7 @@ public class DiskFileItem * @return The content type passed by the agent or <code>null</code> if * not defined. */ + @Override public String getContentType() { return contentType; } @@ -246,6 +248,7 @@ public class DiskFileItem * use the file name anyways, catch the exception and use * {@link org.apache.commons.fileupload.InvalidFileNameException#getName()}. */ + @Override public String getName() { return Streams.checkFileName(fileName); } @@ -259,6 +262,7 @@ public class DiskFileItem * @return <code>true</code> if the file contents will be read * from memory; <code>false</code> otherwise. */ + @Override public boolean isInMemory() { if (cachedContent != null) { return true; @@ -271,6 +275,7 @@ public class DiskFileItem * * @return The size of the file, in bytes. */ + @Override public long getSize() { if (size >= 0) { return size; @@ -291,6 +296,7 @@ public class DiskFileItem * @return The contents of the file as an array of bytes * or {@code null} if the data cannot be read */ + @Override public byte[] get() { if (isInMemory()) { if (cachedContent == null && dfos != null) { @@ -326,6 +332,7 @@ public class DiskFileItem * @throws UnsupportedEncodingException if the requested character * encoding is not available. */ + @Override public String getString(final String charset) throws UnsupportedEncodingException { return new String(get(), charset); @@ -340,6 +347,7 @@ public class DiskFileItem * * @return The contents of the file, as a string. */ + @Override public String getString() { byte[] rawdata = get(); String charset = getCharSet(); @@ -373,6 +381,7 @@ public class DiskFileItem * * @throws Exception if an error occurs. */ + @Override public void write(File file) throws Exception { if (isInMemory()) { FileOutputStream fout = null; @@ -412,6 +421,7 @@ public class DiskFileItem * collected, this method can be used to ensure that this is done at an * earlier time, thus preserving system resources. */ + @Override public void delete() { cachedContent = null; File outputFile = getStoreLocation(); @@ -429,6 +439,7 @@ public class DiskFileItem * @see #setFieldName(java.lang.String) * */ + @Override public String getFieldName() { return fieldName; } @@ -441,6 +452,7 @@ public class DiskFileItem * @see #getFieldName() * */ + @Override public void setFieldName(String fieldName) { this.fieldName = fieldName; } @@ -455,6 +467,7 @@ public class DiskFileItem * @see #setFormField(boolean) * */ + @Override public boolean isFormField() { return isFormField; } @@ -469,6 +482,7 @@ public class DiskFileItem * @see #isFormField() * */ + @Override public void setFormField(boolean state) { isFormField = state; } @@ -482,6 +496,7 @@ public class DiskFileItem * * @throws IOException if an error occurs. */ + @Override public OutputStream getOutputStream() throws IOException { if (dfos == null) { @@ -595,6 +610,7 @@ public class DiskFileItem * Returns the file item headers. * @return The file items headers. */ + @Override public FileItemHeaders getHeaders() { return headers; } @@ -603,6 +619,7 @@ public class DiskFileItem * Sets the file item headers. * @param pHeaders The file items headers. */ + @Override public void setHeaders(FileItemHeaders pHeaders) { headers = pHeaders; } http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/3ac3b9c3/src/main/java/org/apache/commons/fileupload/disk/DiskFileItemFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/fileupload/disk/DiskFileItemFactory.java b/src/main/java/org/apache/commons/fileupload/disk/DiskFileItemFactory.java index c9deb50..edcaec1 100644 --- a/src/main/java/org/apache/commons/fileupload/disk/DiskFileItemFactory.java +++ b/src/main/java/org/apache/commons/fileupload/disk/DiskFileItemFactory.java @@ -194,6 +194,7 @@ public class DiskFileItemFactory implements FileItemFactory { * * @return The newly created file item. */ + @Override public FileItem createItem(String fieldName, String contentType, boolean isFormField, String fileName) { DiskFileItem result = new DiskFileItem(fieldName, contentType, http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/3ac3b9c3/src/main/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java b/src/main/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java index 78ba363..f10c72e 100644 --- a/src/main/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java +++ b/src/main/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java @@ -61,6 +61,7 @@ public class PortletRequestContext implements UploadContext { * * @return The character encoding for the request. */ + @Override public String getCharacterEncoding() { return request.getCharacterEncoding(); } @@ -70,6 +71,7 @@ public class PortletRequestContext implements UploadContext { * * @return The content type of the request. */ + @Override public String getContentType() { return request.getContentType(); } @@ -80,6 +82,7 @@ public class PortletRequestContext implements UploadContext { * @return The content length of the request. * @deprecated 1.3 Use {@link #contentLength()} instead */ + @Override @Deprecated public int getContentLength() { return request.getContentLength(); @@ -91,6 +94,7 @@ public class PortletRequestContext implements UploadContext { * @return The content length of the request. * @since 1.3 */ + @Override public long contentLength() { long size; try { @@ -108,6 +112,7 @@ public class PortletRequestContext implements UploadContext { * * @throws IOException if a problem occurs. */ + @Override public InputStream getInputStream() throws IOException { return request.getPortletInputStream(); } http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/3ac3b9c3/src/main/java/org/apache/commons/fileupload/servlet/FileCleanerCleanup.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/fileupload/servlet/FileCleanerCleanup.java b/src/main/java/org/apache/commons/fileupload/servlet/FileCleanerCleanup.java index 097dd71..cb8b30d 100644 --- a/src/main/java/org/apache/commons/fileupload/servlet/FileCleanerCleanup.java +++ b/src/main/java/org/apache/commons/fileupload/servlet/FileCleanerCleanup.java @@ -68,6 +68,7 @@ public class FileCleanerCleanup implements ServletContextListener { * @param sce The servlet context, used for calling * {@link #setFileCleaningTracker(ServletContext, FileCleaningTracker)}. */ + @Override public void contextInitialized(ServletContextEvent sce) { setFileCleaningTracker(sce.getServletContext(), new FileCleaningTracker()); @@ -80,6 +81,7 @@ public class FileCleanerCleanup implements ServletContextListener { * @param sce The servlet context, used for calling * {@link #getFileCleaningTracker(ServletContext)}. */ + @Override public void contextDestroyed(ServletContextEvent sce) { getFileCleaningTracker(sce.getServletContext()).exitWhenFinished(); } http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/3ac3b9c3/src/main/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java b/src/main/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java index 1169545..b962734 100644 --- a/src/main/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java +++ b/src/main/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java @@ -59,6 +59,7 @@ public class ServletRequestContext implements UploadContext { * * @return The character encoding for the request. */ + @Override public String getCharacterEncoding() { return request.getCharacterEncoding(); } @@ -68,6 +69,7 @@ public class ServletRequestContext implements UploadContext { * * @return The content type of the request. */ + @Override public String getContentType() { return request.getContentType(); } @@ -78,6 +80,7 @@ public class ServletRequestContext implements UploadContext { * @return The content length of the request. * @deprecated 1.3 Use {@link #contentLength()} instead */ + @Override @Deprecated public int getContentLength() { return request.getContentLength(); @@ -89,6 +92,7 @@ public class ServletRequestContext implements UploadContext { * @return The content length of the request. * @since 1.3 */ + @Override public long contentLength() { long size; try { @@ -106,6 +110,7 @@ public class ServletRequestContext implements UploadContext { * * @throws IOException if a problem occurs. */ + @Override public InputStream getInputStream() throws IOException { return request.getInputStream(); } http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/3ac3b9c3/src/main/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java b/src/main/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java index ba6509c..2845e32 100644 --- a/src/main/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java +++ b/src/main/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java @@ -48,6 +48,7 @@ public class FileItemHeadersImpl implements FileItemHeaders, Serializable { /** * {@inheritDoc} */ + @Override public String getHeader(String name) { String nameLower = name.toLowerCase(Locale.ENGLISH); List<String> headerValueList = headerNameToValueListMap.get(nameLower); @@ -60,6 +61,7 @@ public class FileItemHeadersImpl implements FileItemHeaders, Serializable { /** * {@inheritDoc} */ + @Override public Iterator<String> getHeaderNames() { return headerNameToValueListMap.keySet().iterator(); } @@ -67,6 +69,7 @@ public class FileItemHeadersImpl implements FileItemHeaders, Serializable { /** * {@inheritDoc} */ + @Override public Iterator<String> getHeaders(String name) { String nameLower = name.toLowerCase(Locale.ENGLISH); List<String> headerValueList = headerNameToValueListMap.get(nameLower); http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/3ac3b9c3/src/main/java/org/apache/commons/fileupload/util/LimitedInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/fileupload/util/LimitedInputStream.java b/src/main/java/org/apache/commons/fileupload/util/LimitedInputStream.java index 9080a37..5946653 100644 --- a/src/main/java/org/apache/commons/fileupload/util/LimitedInputStream.java +++ b/src/main/java/org/apache/commons/fileupload/util/LimitedInputStream.java @@ -143,6 +143,7 @@ public abstract class LimitedInputStream extends FilterInputStream implements Cl * @return True, if the stream is closed, otherwise false. * @throws IOException An I/O error occurred. */ + @Override public boolean isClosed() throws IOException { return closed; } http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/3ac3b9c3/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java b/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java index 7df2bdd..0d9673d 100644 --- a/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java +++ b/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java @@ -72,6 +72,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getAuthType() */ + @Override public String getAuthType() { return null; } @@ -79,6 +80,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getCookies() */ + @Override public Cookie[] getCookies() { return null; } @@ -86,6 +88,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getDateHeader(String) */ + @Override public long getDateHeader(String arg0) { return 0; } @@ -93,6 +96,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getHeader(String) */ + @Override public String getHeader(String headerName) { return m_headers.get(headerName); } @@ -100,6 +104,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getHeaders(String) */ + @Override public Enumeration<String> getHeaders(String arg0) { // todo - implement return null; @@ -108,6 +113,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getHeaderNames() */ + @Override public Enumeration<String> getHeaderNames() { // todo - implement return null; @@ -116,6 +122,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getIntHeader(String) */ + @Override public int getIntHeader(String arg0) { return 0; } @@ -123,6 +130,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getMethod() */ + @Override public String getMethod() { return null; } @@ -130,6 +138,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getPathInfo() */ + @Override public String getPathInfo() { return null; } @@ -137,6 +146,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getPathTranslated() */ + @Override public String getPathTranslated() { return null; } @@ -144,6 +154,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getContextPath() */ + @Override public String getContextPath() { return null; } @@ -151,6 +162,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getQueryString() */ + @Override public String getQueryString() { return null; } @@ -158,6 +170,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getRemoteUser() */ + @Override public String getRemoteUser() { return null; } @@ -165,6 +178,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#isUserInRole(String) */ + @Override public boolean isUserInRole(String arg0) { return false; } @@ -172,6 +186,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getUserPrincipal() */ + @Override public Principal getUserPrincipal() { return null; } @@ -179,6 +194,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getRequestedSessionId() */ + @Override public String getRequestedSessionId() { return null; } @@ -186,6 +202,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getRequestURI() */ + @Override public String getRequestURI() { return null; } @@ -193,6 +210,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getRequestURL() */ + @Override public StringBuffer getRequestURL() { return null; } @@ -200,6 +218,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getServletPath() */ + @Override public String getServletPath() { return null; } @@ -207,6 +226,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getSession(boolean) */ + @Override public HttpSession getSession(boolean arg0) { return null; } @@ -214,6 +234,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#getSession() */ + @Override public HttpSession getSession() { return null; } @@ -221,6 +242,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid() */ + @Override public boolean isRequestedSessionIdValid() { return false; } @@ -228,6 +250,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie() */ + @Override public boolean isRequestedSessionIdFromCookie() { return false; } @@ -235,6 +258,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL() */ + @Override public boolean isRequestedSessionIdFromURL() { return false; } @@ -243,6 +267,7 @@ public class MockHttpServletRequest implements HttpServletRequest { * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromUrl() * @deprecated */ + @Override @Deprecated public boolean isRequestedSessionIdFromUrl() { return false; @@ -251,6 +276,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getAttribute(String) */ + @Override public Object getAttribute(String arg0) { return null; } @@ -258,6 +284,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getAttributeNames() */ + @Override public Enumeration<String> getAttributeNames() { return null; } @@ -265,6 +292,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getCharacterEncoding() */ + @Override public String getCharacterEncoding() { return null; } @@ -272,6 +300,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#setCharacterEncoding(String) */ + @Override public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException { } @@ -279,6 +308,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getContentLength() */ + @Override public int getContentLength() { int iLength = 0; @@ -303,6 +333,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getContentType() */ + @Override public String getContentType() { return m_strContentType; } @@ -310,6 +341,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getInputStream() */ + @Override public ServletInputStream getInputStream() throws IOException { ServletInputStream sis = new MyServletInputStream(m_requestData, readLimit); return sis; @@ -327,6 +359,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getParameter(String) */ + @Override public String getParameter(String arg0) { return null; } @@ -334,6 +367,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getParameterNames() */ + @Override public Enumeration<String> getParameterNames() { return null; } @@ -341,6 +375,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getParameterValues(String) */ + @Override public String[] getParameterValues(String arg0) { return null; } @@ -348,6 +383,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getParameterMap() */ + @Override public Map<String, String[]> getParameterMap() { return null; } @@ -355,6 +391,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getProtocol() */ + @Override public String getProtocol() { return null; } @@ -362,6 +399,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getScheme() */ + @Override public String getScheme() { return null; } @@ -369,6 +407,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getServerName() */ + @Override public String getServerName() { return null; } @@ -376,6 +415,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getLocalName() */ + @Override @SuppressWarnings("javadoc") // This is a Servlet 2.4 method public String getLocalName() { return null; @@ -384,6 +424,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getServerPort() */ + @Override public int getServerPort() { return 0; } @@ -391,6 +432,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getLocalPort() */ + @Override @SuppressWarnings("javadoc") // This is a Servlet 2.4 method public int getLocalPort() { return 0; @@ -399,6 +441,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getRemotePort() */ + @Override @SuppressWarnings("javadoc") // This is a Servlet 2.4 method public int getRemotePort() { return 0; @@ -407,6 +450,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getReader() */ + @Override public BufferedReader getReader() throws IOException { return null; } @@ -414,6 +458,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getRemoteAddr() */ + @Override public String getRemoteAddr() { return null; } @@ -421,6 +466,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getLocalAddr() */ + @Override @SuppressWarnings("javadoc") // This is a Servlet 2.4 method public String getLocalAddr() { return null; @@ -429,6 +475,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getRemoteHost() */ + @Override public String getRemoteHost() { return null; } @@ -436,18 +483,21 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#setAttribute(String, Object) */ + @Override public void setAttribute(String arg0, Object arg1) { } /** * @see javax.servlet.ServletRequest#removeAttribute(String) */ + @Override public void removeAttribute(String arg0) { } /** * @see javax.servlet.ServletRequest#getLocale() */ + @Override public Locale getLocale() { return null; } @@ -455,6 +505,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getLocales() */ + @Override public Enumeration<Locale> getLocales() { return null; } @@ -462,6 +513,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#isSecure() */ + @Override public boolean isSecure() { return false; } @@ -469,6 +521,7 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * @see javax.servlet.ServletRequest#getRequestDispatcher(String) */ + @Override public RequestDispatcher getRequestDispatcher(String arg0) { return null; } @@ -477,6 +530,7 @@ public class MockHttpServletRequest implements HttpServletRequest { * @see javax.servlet.ServletRequest#getRealPath(String) * @deprecated */ + @Override @Deprecated public String getRealPath(String arg0) { return null; http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/3ac3b9c3/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java b/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java index 1de976d..4b30080 100644 --- a/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java +++ b/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java @@ -47,6 +47,7 @@ public class ProgressListenerTest { expectedItems = pItems; } + @Override public void update(long pBytesRead, long pContentLength, int pItems) { assertTrue(pBytesRead >= 0 && pBytesRead <= expectedContentLength); assertTrue(pContentLength == -1 || pContentLength == expectedContentLength);
