You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/06/05 15:06:45 UTC
[commons-fileupload] 02/03: Precise class names
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 807deeffe5e83fa1ddcf147d4414af2c3a1c8950
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 08:53:56 2023 -0400
Precise class names
---
...{ServletFileUpload.java => JavaxServletFileUpload.java} | 6 +++---
.../fileupload2/javax/JavaxProgressListenerTest.java | 6 +++---
.../fileupload2/javax/JavaxServletFileUploadTest.java | 14 +++++++-------
.../apache/commons/fileupload2/javax/JavaxSizesTest.java | 6 +++---
.../commons/fileupload2/javax/JavaxStreamingTest.java | 6 +++---
...{PortletFileUpload.java => JavaxPortletFileUpload.java} | 8 ++++----
.../commons/fileupload2/portlet/PortletFileUploadTest.java | 8 ++++----
7 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/ServletFileUpload.java b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java
similarity index 96%
rename from commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/ServletFileUpload.java
rename to commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java
index 4293b1f..683884b 100644
--- a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/ServletFileUpload.java
+++ b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java
@@ -40,7 +40,7 @@ import org.apache.commons.fileupload2.FileUploadException;
* How the data for individual parts is stored is determined by the factory used to create them; a given part may be in memory, on disk, or somewhere else.
* </p>
*/
-public class ServletFileUpload extends FileUpload<HttpServletRequest> {
+public class JavaxServletFileUpload extends FileUpload<HttpServletRequest> {
/**
* Constant for HTTP POST method.
@@ -64,7 +64,7 @@ public class ServletFileUpload extends FileUpload<HttpServletRequest> {
*
* @see FileUpload#FileUpload(FileItemFactory)
*/
- public ServletFileUpload() {
+ public JavaxServletFileUpload() {
}
/**
@@ -73,7 +73,7 @@ public class ServletFileUpload extends FileUpload<HttpServletRequest> {
* @see FileUpload#FileUpload()
* @param fileItemFactory The factory to use for creating file items.
*/
- public ServletFileUpload(final FileItemFactory fileItemFactory) {
+ public JavaxServletFileUpload(final FileItemFactory fileItemFactory) {
super(fileItemFactory);
}
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerTest.java
index b858192..acdfd11 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerTest.java
@@ -26,11 +26,11 @@ import org.apache.commons.fileupload2.ProgressListener;
/**
* Tests the {@link ProgressListener}.
*/
-public class JavaxProgressListenerTest extends AbstractProgressListenerTest<ServletFileUpload, HttpServletRequest> {
+public class JavaxProgressListenerTest extends AbstractProgressListenerTest<JavaxServletFileUpload, HttpServletRequest> {
@Override
- protected ServletFileUpload newFileUpload() {
- return new ServletFileUpload();
+ protected JavaxServletFileUpload newFileUpload() {
+ return new JavaxServletFileUpload();
}
@Override
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 229e70f..0dae4bf 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
@@ -37,15 +37,15 @@ import org.apache.commons.fileupload2.disk.DiskFileItemFactory;
import org.junit.jupiter.api.Test;
/**
- * Test for {@link ServletFileUpload}.
+ * Test for {@link JavaxServletFileUpload}.
*
* @see AbstractFileUploadTest
* @since 1.4
*/
-public class JavaxServletFileUploadTest extends AbstractFileUploadTest<ServletFileUpload> {
+public class JavaxServletFileUploadTest extends AbstractFileUploadTest<JavaxServletFileUpload> {
public JavaxServletFileUploadTest() {
- super(new ServletFileUpload(new DiskFileItemFactory()));
+ super(new JavaxServletFileUpload(new DiskFileItemFactory()));
}
@Test
@@ -65,7 +65,7 @@ public class JavaxServletFileUploadTest extends AbstractFileUploadTest<ServletFi
final DiskFileItemFactory fileItemFactory = new DiskFileItemFactory();
fileItemFactory.setDefaultCharset("UTF-8");
- final ServletFileUpload upload = new ServletFileUpload(fileItemFactory);
+ final JavaxServletFileUpload upload = new JavaxServletFileUpload(fileItemFactory);
final List<FileItem> fileItems = upload.parseRequest(request);
final FileItem fileItem = fileItems.get(0);
assertTrue(fileItem.getString().contains("coñteñt"), fileItem.getString());
@@ -100,7 +100,7 @@ public class JavaxServletFileUploadTest extends AbstractFileUploadTest<ServletFi
final byte[] bytes = text.getBytes(StandardCharsets.US_ASCII);
final HttpServletRequest request = new JavaxMockHttpServletRequest(bytes, Constants.CONTENT_TYPE);
- final ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory());
+ final JavaxServletFileUpload upload = new JavaxServletFileUpload(new DiskFileItemFactory());
final Map<String, List<FileItem>> mappedParameters = upload.parseParameterMap(request);
assertTrue(mappedParameters.containsKey("file"));
assertEquals(1, mappedParameters.get("file").size());
@@ -113,7 +113,7 @@ public class JavaxServletFileUploadTest extends AbstractFileUploadTest<ServletFi
}
@Override
- public List<FileItem> parseUpload(final ServletFileUpload upload, final byte[] bytes, final String contentType) throws FileUploadException {
+ 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));
}
@@ -140,7 +140,7 @@ public class JavaxServletFileUploadTest extends AbstractFileUploadTest<ServletFi
}
baos.write("-----1234--\r\n".getBytes(StandardCharsets.US_ASCII));
- final List<FileItem> fileItems = parseUpload(new ServletFileUpload(new DiskFileItemFactory()), baos.toByteArray());
+ final List<FileItem> fileItems = parseUpload(new JavaxServletFileUpload(new DiskFileItemFactory()), baos.toByteArray());
final Iterator<FileItem> fileIter = fileItems.iterator();
add = 16;
num = 0;
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesTest.java
index 0df386d..d7998e7 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesTest.java
@@ -26,11 +26,11 @@ import org.apache.commons.fileupload2.disk.DiskFileItemFactory;
/**
* Unit test for items with varying sizes.
*/
-public class JavaxSizesTest extends AbstractSizesTest<ServletFileUpload, HttpServletRequest> {
+public class JavaxSizesTest extends AbstractSizesTest<JavaxServletFileUpload, HttpServletRequest> {
@Override
- protected ServletFileUpload newFileUpload() {
- return new ServletFileUpload(new DiskFileItemFactory());
+ protected JavaxServletFileUpload newFileUpload() {
+ return new JavaxServletFileUpload(new DiskFileItemFactory());
}
@Override
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 6851b3c..3f2931c 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,11 +25,11 @@ import org.apache.commons.fileupload2.AbstractStreamingTest;
/**
* Unit test for items with varying sizes.
*/
-public class JavaxStreamingTest extends AbstractStreamingTest<ServletFileUpload, HttpServletRequest, ServletRequestContext> {
+public class JavaxStreamingTest extends AbstractStreamingTest<JavaxServletFileUpload, HttpServletRequest, ServletRequestContext> {
@Override
- protected ServletFileUpload newFileUpload() {
- return new ServletFileUpload();
+ protected JavaxServletFileUpload newFileUpload() {
+ return new JavaxServletFileUpload();
}
@Override
diff --git a/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/PortletFileUpload.java b/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/JavaxPortletFileUpload.java
similarity index 95%
rename from commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/PortletFileUpload.java
rename to commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/JavaxPortletFileUpload.java
index c20faf3..59fc443 100644
--- a/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/PortletFileUpload.java
+++ b/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/JavaxPortletFileUpload.java
@@ -33,7 +33,7 @@ import org.apache.commons.fileupload2.FileUploadException;
* High level API for processing file uploads.
* <p>
* This class handles multiple files per single HTML widget, sent using {@code multipart/mixed} encoding type, as specified by
- * <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>. Use {@link org.apache.commons.fileupload2.javax.ServletFileUpload
+ * <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>. Use {@link org.apache.commons.fileupload2.javax.JavaxServletFileUpload
* #parseRequest(javax.servlet.http.HttpServletRequest)} to acquire a list of {@link org.apache.commons.fileupload2.FileItem FileItems} associated with a given
* HTML widget.
* </p>
@@ -43,7 +43,7 @@ import org.apache.commons.fileupload2.FileUploadException;
*
* @since 1.1
*/
-public class PortletFileUpload extends FileUpload<ActionRequest> {
+public class JavaxPortletFileUpload extends FileUpload<ActionRequest> {
/**
* Tests whether the request contains multipart content.
@@ -61,7 +61,7 @@ public class PortletFileUpload extends FileUpload<ActionRequest> {
*
* @see FileUpload#FileUpload(FileItemFactory)
*/
- public PortletFileUpload() {
+ public JavaxPortletFileUpload() {
}
/**
@@ -70,7 +70,7 @@ public class PortletFileUpload extends FileUpload<ActionRequest> {
* @see FileUpload#FileUpload()
* @param fileItemFactory The factory to use for creating file items.
*/
- public PortletFileUpload(final FileItemFactory fileItemFactory) {
+ public JavaxPortletFileUpload(final FileItemFactory fileItemFactory) {
super(fileItemFactory);
}
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 ae1a74d..afd7365 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
@@ -36,15 +36,15 @@ import org.apache.commons.fileupload2.javax.ServletRequestContext;
import org.junit.jupiter.api.Test;
/**
- * Test for {@link PortletFileUpload}.
+ * Test for {@link JavaxPortletFileUpload}.
*
* @see AbstractFileUploadTest
* @since 1.4
*/
-public class PortletFileUploadTest extends AbstractFileUploadTest<PortletFileUpload> {
+public class PortletFileUploadTest extends AbstractFileUploadTest<JavaxPortletFileUpload> {
public PortletFileUploadTest() {
- super(new PortletFileUpload(new DiskFileItemFactory()));
+ super(new JavaxPortletFileUpload(new DiskFileItemFactory()));
}
@Test
@@ -85,7 +85,7 @@ public class PortletFileUploadTest extends AbstractFileUploadTest<PortletFileUpl
}
@Override
- public List<FileItem> parseUpload(final PortletFileUpload upload, final byte[] bytes, final String contentType) throws FileUploadException {
+ 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));
}