This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit a79aaf4bf204f00ba5ddb9133a7e3ef40d32c7f4 Author: Gary Gregory <[email protected]> AuthorDate: Mon Jun 5 17:01:51 2023 -0400 Consistent naming --- .../{FileCleanerCleanup.java => JavaxFileCleanerCleanup.java} | 4 ++-- .../apache/commons/fileupload2/javax/JavaxServletFileUpload.java | 8 ++++---- ...ServletRequestContext.java => JavaxServletRequestContext.java} | 4 ++-- .../commons/fileupload2/javax/JavaxServletFileUploadTest.java | 2 +- .../org/apache/commons/fileupload2/javax/JavaxStreamingTest.java | 6 +++--- .../apache/commons/fileupload2/portlet/PortletFileUploadTest.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/FileCleanerCleanup.java b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxFileCleanerCleanup.java similarity index 95% rename from commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/FileCleanerCleanup.java rename to commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxFileCleanerCleanup.java index 4f12a7d..d083087 100644 --- a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/FileCleanerCleanup.java +++ b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxFileCleanerCleanup.java @@ -25,12 +25,12 @@ import org.apache.commons.io.FileCleaningTracker; /** * A servlet context listener, which ensures that the {@link FileCleaningTracker}'s reaper thread is terminated, when the web application is destroyed. */ -public class FileCleanerCleanup implements ServletContextListener { +public class JavaxFileCleanerCleanup implements ServletContextListener { /** * Attribute name, which is used for storing an instance of {@link FileCleaningTracker} in the web application. */ - public static final String FILE_CLEANING_TRACKER_ATTRIBUTE = FileCleanerCleanup.class.getName() + ".FileCleaningTracker"; + public static final String FILE_CLEANING_TRACKER_ATTRIBUTE = JavaxFileCleanerCleanup.class.getName() + ".FileCleaningTracker"; /** * Gets the instance of {@link FileCleaningTracker}, which is associated with the given {@link ServletContext}. diff --git a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java index 683884b..c2ecbbe 100644 --- a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java +++ b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java @@ -55,7 +55,7 @@ public class JavaxServletFileUpload extends FileUpload<HttpServletRequest> { * @return {@code true} if the request is multipart; {@code false} otherwise. */ public static final boolean isMultipartContent(final HttpServletRequest request) { - return POST_METHOD.equalsIgnoreCase(request.getMethod()) && AbstractFileUpload.isMultipartContent(new ServletRequestContext(request)); + return POST_METHOD.equalsIgnoreCase(request.getMethod()) && AbstractFileUpload.isMultipartContent(new JavaxServletRequestContext(request)); } /** @@ -88,7 +88,7 @@ public class JavaxServletFileUpload extends FileUpload<HttpServletRequest> { */ @Override public FileItemIterator getItemIterator(final HttpServletRequest request) throws FileUploadException, IOException { - return super.getItemIterator(new ServletRequestContext(request)); + return super.getItemIterator(new JavaxServletRequestContext(request)); } /** @@ -101,7 +101,7 @@ public class JavaxServletFileUpload extends FileUpload<HttpServletRequest> { */ @Override public Map<String, List<FileItem>> parseParameterMap(final HttpServletRequest request) throws FileUploadException { - return parseParameterMap(new ServletRequestContext(request)); + return parseParameterMap(new JavaxServletRequestContext(request)); } /** @@ -113,7 +113,7 @@ public class JavaxServletFileUpload extends FileUpload<HttpServletRequest> { */ @Override public List<FileItem> parseRequest(final HttpServletRequest request) throws FileUploadException { - return parseRequest(new ServletRequestContext(request)); + return parseRequest(new JavaxServletRequestContext(request)); } } diff --git a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/ServletRequestContext.java b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java similarity index 93% rename from commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/ServletRequestContext.java rename to commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java index 49c7a16..1be7308 100644 --- a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/ServletRequestContext.java +++ b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java @@ -28,7 +28,7 @@ import org.apache.commons.fileupload2.AbstractRequestContext; * * @since 1.1 */ -public class ServletRequestContext extends AbstractRequestContext { +public class JavaxServletRequestContext extends AbstractRequestContext { /** * The request for which the context is being provided. @@ -40,7 +40,7 @@ public class ServletRequestContext extends AbstractRequestContext { * * @param request The request to which this context applies. */ - public ServletRequestContext(final HttpServletRequest request) { + public JavaxServletRequestContext(final HttpServletRequest request) { super(request::getHeader, request::getContentLength); this.request = request; } diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java index 2b448b6..6628d66 100644 --- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java +++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java @@ -115,7 +115,7 @@ public class JavaxServletFileUploadTest extends AbstractFileUploadTest<JavaxServ @Override public List<FileItem> parseUpload(final JavaxServletFileUpload upload, final byte[] bytes, final String contentType) throws FileUploadException { final HttpServletRequest request = new JavaxMockHttpServletRequest(bytes, contentType); - return upload.parseRequest(new ServletRequestContext(request)); + return upload.parseRequest(new JavaxServletRequestContext(request)); } /** diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java index 3f2931c..4f7c64e 100644 --- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java +++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java @@ -25,7 +25,7 @@ import org.apache.commons.fileupload2.AbstractStreamingTest; /** * Unit test for items with varying sizes. */ -public class JavaxStreamingTest extends AbstractStreamingTest<JavaxServletFileUpload, HttpServletRequest, ServletRequestContext> { +public class JavaxStreamingTest extends AbstractStreamingTest<JavaxServletFileUpload, HttpServletRequest, JavaxServletRequestContext> { @Override protected JavaxServletFileUpload newFileUpload() { @@ -38,8 +38,8 @@ public class JavaxStreamingTest extends AbstractStreamingTest<JavaxServletFileUp } @Override - protected ServletRequestContext newServletRequestContext(final HttpServletRequest request) { - return new ServletRequestContext(request); + protected JavaxServletRequestContext newServletRequestContext(final HttpServletRequest request) { + return new JavaxServletRequestContext(request); } } diff --git a/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java b/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java index 00f117a..2be1ebe 100644 --- a/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java +++ b/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java @@ -32,7 +32,7 @@ import org.apache.commons.fileupload2.FileItem; import org.apache.commons.fileupload2.FileUploadException; import org.apache.commons.fileupload2.disk.DiskFileItemFactory; import org.apache.commons.fileupload2.javax.JavaxMockHttpServletRequest; -import org.apache.commons.fileupload2.javax.ServletRequestContext; +import org.apache.commons.fileupload2.javax.JavaxServletRequestContext; import org.junit.jupiter.api.Test; /** @@ -87,7 +87,7 @@ public class PortletFileUploadTest extends AbstractFileUploadTest<JavaxPortletFi @Override public List<FileItem> parseUpload(final JavaxPortletFileUpload upload, final byte[] bytes, final String contentType) throws FileUploadException { final HttpServletRequest request = new JavaxMockHttpServletRequest(bytes, contentType); - return upload.parseRequest(new ServletRequestContext(request)); + return upload.parseRequest(new JavaxServletRequestContext(request)); } }
