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/04/05 23:46:55 UTC
[commons-fileupload] 01/06: Better class name
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 301e773f81f6548a06bdfaa9f54b0e3d99b3a674
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Apr 5 19:31:01 2023 -0400
Better class name
---
...FileUploadBase.java => AbstractFileUpload.java} | 2 +-
.../commons/fileupload2/FileItemIterator.java | 10 ++++----
.../apache/commons/fileupload2/FileItemStream.java | 2 +-
.../org/apache/commons/fileupload2/FileUpload.java | 2 +-
.../fileupload2/impl/FileItemIteratorImpl.java | 28 +++++++++++-----------
.../fileupload2/jaksrvlt/JakSrvltFileUpload.java | 4 ++--
.../jaksrvlt/JakSrvltRequestContext.java | 4 ++--
.../fileupload2/portlet/PortletFileUpload.java | 4 ++--
.../fileupload2/portlet/PortletRequestContext.java | 4 ++--
.../fileupload2/servlet/ServletFileUpload.java | 4 ++--
.../fileupload2/servlet/ServletRequestContext.java | 4 ++--
.../fileupload2/HttpServletRequestFactory.java | 4 ++--
.../fileupload2/MockHttpServletRequest.java | 2 +-
.../apache/commons/fileupload2/StreamingTest.java | 4 ++--
.../jaksrvlt/MockJakSrvltHttpRequest.java | 4 ++--
.../portlet/MockPortletActionRequest.java | 4 ++--
16 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java b/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
similarity index 99%
rename from src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
rename to src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
index 4e28490..46bc68e 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
+++ b/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
@@ -50,7 +50,7 @@ import org.apache.commons.io.IOUtils;
* else.
* </p>
*/
-public abstract class FileUploadBase {
+public abstract class AbstractFileUpload {
/**
* HTTP content type header name.
diff --git a/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java b/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
index c1c7218..160f983 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
@@ -25,7 +25,7 @@ import org.apache.commons.fileupload2.pub.FileUploadByteCountLimitException;
/**
* An iterator, as returned by
- * {@link FileUploadBase#getItemIterator(RequestContext)}.
+ * {@link AbstractFileUpload#getItemIterator(RequestContext)}.
*/
public interface FileItemIterator {
@@ -34,7 +34,7 @@ public interface FileItemIterator {
/**
* Gets the maximum size of a single file. An {@link FileUploadByteCountLimitException}
* will be thrown, if there is an uploaded file, which is exceeding this value.
- * By default, this value will be copied from the {@link FileUploadBase#getFileSizeMax()
+ * By default, this value will be copied from the {@link AbstractFileUpload#getFileSizeMax()
* FileUploadBase} object, however, the user may replace the default value with a
* request specific value by invoking {@link #setFileSizeMax(long)} on this object.
* @return The maximum size of a single, uploaded file. The value -1 indicates "unlimited".
@@ -44,7 +44,7 @@ public interface FileItemIterator {
/**
* Gets the maximum size of the complete HTTP request. A {@link SizeLimitExceededException}
* will be thrown, if the HTTP request will exceed this value.
- * By default, this value will be copied from the {@link FileUploadBase#getSizeMax()
+ * By default, this value will be copied from the {@link AbstractFileUpload#getSizeMax()
* FileUploadBase} object, however, the user may replace the default value with a
* request specific value by invoking {@link #setSizeMax(long)} on this object.
* @return The maximum size of the complete HTTP request. The value -1 indicates "unlimited".
@@ -79,7 +79,7 @@ public interface FileItemIterator {
/**
* Sets the maximum size of a single file. An {@link FileUploadByteCountLimitException}
* will be thrown, if there is an uploaded file, which is exceeding this value.
- * By default, this value will be copied from the {@link FileUploadBase#getFileSizeMax()
+ * By default, this value will be copied from the {@link AbstractFileUpload#getFileSizeMax()
* FileUploadBase} object, however, the user may replace the default value with a
* request specific value by invoking {@link #setFileSizeMax(long)} on this object, so
* there is no need to configure it here.
@@ -93,7 +93,7 @@ public interface FileItemIterator {
/**
* Sets the maximum size of the complete HTTP request. A {@link SizeLimitExceededException}
* will be thrown, if the HTTP request will exceed this value.
- * By default, this value will be copied from the {@link FileUploadBase#getSizeMax()
+ * By default, this value will be copied from the {@link AbstractFileUpload#getSizeMax()
* FileUploadBase} object, however, the user may replace the default value with a
* request specific value by invoking {@link #setSizeMax(long)} on this object.
* <p>
diff --git a/src/main/java/org/apache/commons/fileupload2/FileItemStream.java b/src/main/java/org/apache/commons/fileupload2/FileItemStream.java
index 84ca57c..cef170f 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileItemStream.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileItemStream.java
@@ -27,7 +27,7 @@ import java.io.InputStream;
* </p>
* <p>Instances of this class are created by accessing the
* iterator, returned by
- * {@link FileUploadBase#getItemIterator(RequestContext)}.
+ * {@link AbstractFileUpload#getItemIterator(RequestContext)}.
* </p>
* <p><em>Note</em>: There is an interaction between the iterator and
* its associated instances of {@link FileItemStream}: By invoking
diff --git a/src/main/java/org/apache/commons/fileupload2/FileUpload.java b/src/main/java/org/apache/commons/fileupload2/FileUpload.java
index 95c53e8..6a8e05a 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileUpload.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileUpload.java
@@ -30,7 +30,7 @@ package org.apache.commons.fileupload2;
* used to create them; a given part may be in memory, on disk, or somewhere
* else.</p>
*/
-public class FileUpload extends FileUploadBase {
+public class FileUpload extends AbstractFileUpload {
/**
* The factory to use to create new form items.
diff --git a/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java b/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
index 9aa60fe..524c301 100644
--- a/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
+++ b/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
@@ -30,7 +30,7 @@ import org.apache.commons.fileupload2.FileItem;
import org.apache.commons.fileupload2.FileItemHeaders;
import org.apache.commons.fileupload2.FileItemIterator;
import org.apache.commons.fileupload2.FileItemStream;
-import org.apache.commons.fileupload2.FileUploadBase;
+import org.apache.commons.fileupload2.AbstractFileUpload;
import org.apache.commons.fileupload2.FileUploadException;
import org.apache.commons.fileupload2.MultipartStream;
import org.apache.commons.fileupload2.ProgressListener;
@@ -41,16 +41,16 @@ import org.apache.commons.fileupload2.util.LimitedInputStream;
import org.apache.commons.io.IOUtils;
/**
- * The iterator, which is returned by {@link FileUploadBase#getItemIterator(RequestContext)}.
+ * The iterator, which is returned by {@link AbstractFileUpload#getItemIterator(RequestContext)}.
*/
public class FileItemIteratorImpl implements FileItemIterator {
/**
* The file uploads processing utility.
*
- * @see FileUploadBase
+ * @see AbstractFileUpload
*/
- private final FileUploadBase fileUploadBase;
+ private final AbstractFileUpload fileUploadBase;
/**
* The request context.
@@ -117,7 +117,7 @@ public class FileItemIteratorImpl implements FileItemIterator {
* @throws FileUploadException An error occurred while parsing the request.
* @throws IOException An I/O error occurred.
*/
- public FileItemIteratorImpl(final FileUploadBase fileUploadBase, final RequestContext requestContext) throws FileUploadException, IOException {
+ public FileItemIteratorImpl(final AbstractFileUpload fileUploadBase, final RequestContext requestContext) throws FileUploadException, IOException {
this.fileUploadBase = fileUploadBase;
this.sizeMax = fileUploadBase.getSizeMax();
this.fileSizeMax = fileUploadBase.getFileSizeMax();
@@ -164,8 +164,8 @@ public class FileItemIteratorImpl implements FileItemIterator {
// We're parsing the outer multipart
final String fieldName = fileUploadBase.getFieldName(headers);
if (fieldName != null) {
- final String subContentType = headers.getHeader(FileUploadBase.CONTENT_TYPE);
- if (subContentType != null && subContentType.toLowerCase(Locale.ENGLISH).startsWith(FileUploadBase.MULTIPART_MIXED)) {
+ final String subContentType = headers.getHeader(AbstractFileUpload.CONTENT_TYPE);
+ if (subContentType != null && subContentType.toLowerCase(Locale.ENGLISH).startsWith(AbstractFileUpload.MULTIPART_MIXED)) {
currentFieldName = fieldName;
// Multiple files associated with this field name
final byte[] subBoundary = fileUploadBase.getBoundary(subContentType);
@@ -174,7 +174,7 @@ public class FileItemIteratorImpl implements FileItemIterator {
continue;
}
final String fileName = fileUploadBase.getFileName(headers);
- currentItem = new FileItemStreamImpl(this, fileName, fieldName, headers.getHeader(FileUploadBase.CONTENT_TYPE), fileName == null,
+ currentItem = new FileItemStreamImpl(this, fileName, fieldName, headers.getHeader(AbstractFileUpload.CONTENT_TYPE), fileName == null,
getContentLength(headers));
currentItem.setHeaders(headers);
progressNotifier.noteItem();
@@ -184,7 +184,7 @@ public class FileItemIteratorImpl implements FileItemIterator {
} else {
final String fileName = fileUploadBase.getFileName(headers);
if (fileName != null) {
- currentItem = new FileItemStreamImpl(this, fileName, currentFieldName, headers.getHeader(FileUploadBase.CONTENT_TYPE), false,
+ currentItem = new FileItemStreamImpl(this, fileName, currentFieldName, headers.getHeader(AbstractFileUpload.CONTENT_TYPE), false,
getContentLength(headers));
currentItem.setHeaders(headers);
progressNotifier.noteItem();
@@ -198,7 +198,7 @@ public class FileItemIteratorImpl implements FileItemIterator {
private long getContentLength(final FileItemHeaders headers) {
try {
- return Long.parseLong(headers.getHeader(FileUploadBase.CONTENT_LENGTH));
+ return Long.parseLong(headers.getHeader(AbstractFileUpload.CONTENT_LENGTH));
} catch (final Exception e) {
return -1;
}
@@ -249,11 +249,11 @@ public class FileItemIteratorImpl implements FileItemIterator {
return findNextItem();
}
- protected void init(final FileUploadBase fileUploadBase, final RequestContext requestContext) throws FileUploadException, IOException {
+ protected void init(final AbstractFileUpload fileUploadBase, final RequestContext requestContext) throws FileUploadException, IOException {
final String contentType = ctx.getContentType();
- if ((null == contentType) || (!contentType.toLowerCase(Locale.ENGLISH).startsWith(FileUploadBase.MULTIPART))) {
+ if ((null == contentType) || (!contentType.toLowerCase(Locale.ENGLISH).startsWith(AbstractFileUpload.MULTIPART))) {
throw new FileUploadContentTypeException(format("the request doesn't contain a %s or %s stream, content type header is %s",
- FileUploadBase.MULTIPART_FORM_DATA, FileUploadBase.MULTIPART_MIXED, contentType), contentType);
+ AbstractFileUpload.MULTIPART_FORM_DATA, AbstractFileUpload.MULTIPART_MIXED, contentType), contentType);
}
final long contentLengthInt = ctx.getContentLength();
// @formatter:off
@@ -298,7 +298,7 @@ public class FileItemIteratorImpl implements FileItemIterator {
multiPartStream = new MultipartStream(input, multiPartBoundary, progressNotifier);
} catch (final IllegalArgumentException e) {
IOUtils.closeQuietly(input); // avoid possible resource leak
- throw new FileUploadContentTypeException(format("The boundary specified in the %s header is too long", FileUploadBase.CONTENT_TYPE), e);
+ throw new FileUploadContentTypeException(format("The boundary specified in the %s header is too long", AbstractFileUpload.CONTENT_TYPE), e);
}
multiPartStream.setHeaderEncoding(charEncoding);
}
diff --git a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java
index b2bc3c1..2294ea8 100644
--- a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java
+++ b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java
@@ -24,7 +24,7 @@ import org.apache.commons.fileupload2.FileItem;
import org.apache.commons.fileupload2.FileItemFactory;
import org.apache.commons.fileupload2.FileItemIterator;
import org.apache.commons.fileupload2.FileUpload;
-import org.apache.commons.fileupload2.FileUploadBase;
+import org.apache.commons.fileupload2.AbstractFileUpload;
import org.apache.commons.fileupload2.FileUploadException;
import jakarta.servlet.http.HttpServletRequest;
@@ -66,7 +66,7 @@ public class JakSrvltFileUpload extends FileUpload {
if (!POST_METHOD.equalsIgnoreCase(request.getMethod())) {
return false;
}
- return FileUploadBase.isMultipartContent(new JakSrvltRequestContext(request));
+ return AbstractFileUpload.isMultipartContent(new JakSrvltRequestContext(request));
}
/**
diff --git a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltRequestContext.java b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltRequestContext.java
index 6faf0e1..b05faf0 100644
--- a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltRequestContext.java
+++ b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltRequestContext.java
@@ -21,7 +21,7 @@ import static java.lang.String.format;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.commons.fileupload2.FileUploadBase;
+import org.apache.commons.fileupload2.AbstractFileUpload;
import org.apache.commons.fileupload2.RequestContext;
import jakarta.servlet.http.HttpServletRequest;
@@ -58,7 +58,7 @@ public class JakSrvltRequestContext implements RequestContext {
public long getContentLength() {
long size;
try {
- size = Long.parseLong(request.getHeader(FileUploadBase.CONTENT_LENGTH));
+ size = Long.parseLong(request.getHeader(AbstractFileUpload.CONTENT_LENGTH));
} catch (final NumberFormatException e) {
size = request.getContentLength();
}
diff --git a/src/main/java/org/apache/commons/fileupload2/portlet/PortletFileUpload.java b/src/main/java/org/apache/commons/fileupload2/portlet/PortletFileUpload.java
index 00a6e82..813b70d 100644
--- a/src/main/java/org/apache/commons/fileupload2/portlet/PortletFileUpload.java
+++ b/src/main/java/org/apache/commons/fileupload2/portlet/PortletFileUpload.java
@@ -26,7 +26,7 @@ import org.apache.commons.fileupload2.FileItem;
import org.apache.commons.fileupload2.FileItemFactory;
import org.apache.commons.fileupload2.FileItemIterator;
import org.apache.commons.fileupload2.FileUpload;
-import org.apache.commons.fileupload2.FileUploadBase;
+import org.apache.commons.fileupload2.AbstractFileUpload;
import org.apache.commons.fileupload2.FileUploadException;
/**
@@ -58,7 +58,7 @@ public class PortletFileUpload extends FileUpload {
* {@code false} otherwise.
*/
public static final boolean isMultipartContent(final ActionRequest request) {
- return FileUploadBase.isMultipartContent(
+ return AbstractFileUpload.isMultipartContent(
new PortletRequestContext(request));
}
diff --git a/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java b/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java
index 064fda8..235ff52 100644
--- a/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java
+++ b/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java
@@ -23,7 +23,7 @@ import java.io.InputStream;
import javax.portlet.ActionRequest;
-import org.apache.commons.fileupload2.FileUploadBase;
+import org.apache.commons.fileupload2.AbstractFileUpload;
import org.apache.commons.fileupload2.RequestContext;
/**
@@ -58,7 +58,7 @@ public class PortletRequestContext implements RequestContext {
public long getContentLength() {
long size;
try {
- size = Long.parseLong(request.getProperty(FileUploadBase.CONTENT_LENGTH));
+ size = Long.parseLong(request.getProperty(AbstractFileUpload.CONTENT_LENGTH));
} catch (final NumberFormatException e) {
size = request.getContentLength();
}
diff --git a/src/main/java/org/apache/commons/fileupload2/servlet/ServletFileUpload.java b/src/main/java/org/apache/commons/fileupload2/servlet/ServletFileUpload.java
index e445b4a..2a29dbc 100644
--- a/src/main/java/org/apache/commons/fileupload2/servlet/ServletFileUpload.java
+++ b/src/main/java/org/apache/commons/fileupload2/servlet/ServletFileUpload.java
@@ -26,7 +26,7 @@ import org.apache.commons.fileupload2.FileItem;
import org.apache.commons.fileupload2.FileItemFactory;
import org.apache.commons.fileupload2.FileItemIterator;
import org.apache.commons.fileupload2.FileUpload;
-import org.apache.commons.fileupload2.FileUploadBase;
+import org.apache.commons.fileupload2.AbstractFileUpload;
import org.apache.commons.fileupload2.FileUploadException;
/**
@@ -66,7 +66,7 @@ public class ServletFileUpload extends FileUpload {
if (!POST_METHOD.equalsIgnoreCase(request.getMethod())) {
return false;
}
- return FileUploadBase.isMultipartContent(new ServletRequestContext(request));
+ return AbstractFileUpload.isMultipartContent(new ServletRequestContext(request));
}
/**
diff --git a/src/main/java/org/apache/commons/fileupload2/servlet/ServletRequestContext.java b/src/main/java/org/apache/commons/fileupload2/servlet/ServletRequestContext.java
index 86f36f5..1af21e6 100644
--- a/src/main/java/org/apache/commons/fileupload2/servlet/ServletRequestContext.java
+++ b/src/main/java/org/apache/commons/fileupload2/servlet/ServletRequestContext.java
@@ -23,7 +23,7 @@ import java.io.InputStream;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.fileupload2.FileUploadBase;
+import org.apache.commons.fileupload2.AbstractFileUpload;
import org.apache.commons.fileupload2.RequestContext;
/**
@@ -58,7 +58,7 @@ public class ServletRequestContext implements RequestContext {
public long getContentLength() {
long size;
try {
- size = Long.parseLong(request.getHeader(FileUploadBase.CONTENT_LENGTH));
+ size = Long.parseLong(request.getHeader(AbstractFileUpload.CONTENT_LENGTH));
} catch (final NumberFormatException e) {
size = request.getContentLength();
}
diff --git a/src/test/java/org/apache/commons/fileupload2/HttpServletRequestFactory.java b/src/test/java/org/apache/commons/fileupload2/HttpServletRequestFactory.java
index 174b563..e4ee1c9 100644
--- a/src/test/java/org/apache/commons/fileupload2/HttpServletRequestFactory.java
+++ b/src/test/java/org/apache/commons/fileupload2/HttpServletRequestFactory.java
@@ -31,7 +31,7 @@ final class HttpServletRequestFactory {
final byte[] requestData = "foobar".getBytes();
return new MockHttpServletRequest(
requestData,
- FileUploadBase.MULTIPART_FORM_DATA);
+ AbstractFileUpload.MULTIPART_FORM_DATA);
}
public static HttpServletRequest createValidHttpServletRequest(
@@ -48,7 +48,7 @@ final class HttpServletRequestFactory {
return new MockHttpServletRequest(
requestData,
- FileUploadBase.MULTIPART_FORM_DATA);
+ AbstractFileUpload.MULTIPART_FORM_DATA);
}
}
diff --git a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
index 24702f1..45a4ec7 100644
--- a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
+++ b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
@@ -96,7 +96,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
mmRequestData = requestData;
length = requestLength;
mStrContentType = strContentType;
- mHeaders.put(FileUploadBase.CONTENT_TYPE, strContentType);
+ mHeaders.put(AbstractFileUpload.CONTENT_TYPE, strContentType);
}
/**
diff --git a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
index eb3fc25..4e331ad 100644
--- a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
@@ -93,7 +93,7 @@ public class StreamingTest {
throws FileUploadException {
final String contentType = "multipart/form-data; boundary=---1234";
- final FileUploadBase upload = new ServletFileUpload();
+ final AbstractFileUpload upload = new ServletFileUpload();
upload.setFileItemFactory(new DiskFileItemFactory());
final HttpServletRequest request = new MockHttpServletRequest(inputStream,
length, contentType);
@@ -105,7 +105,7 @@ public class StreamingTest {
throws FileUploadException, IOException {
final String contentType = "multipart/form-data; boundary=---1234";
- final FileUploadBase upload = new ServletFileUpload();
+ final AbstractFileUpload upload = new ServletFileUpload();
upload.setFileItemFactory(new DiskFileItemFactory());
final HttpServletRequest request = new MockHttpServletRequest(inputStream,
length, contentType);
diff --git a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
index 73c58cf..440c2a3 100644
--- a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
+++ b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
@@ -27,7 +27,7 @@ import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.fileupload2.FileUploadBase;
+import org.apache.commons.fileupload2.AbstractFileUpload;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
@@ -124,7 +124,7 @@ public class MockJakSrvltHttpRequest implements HttpServletRequest {
mRequestData = requestData;
length = requestLength;
mStrContentType = strContentType;
- mHeaders.put(FileUploadBase.CONTENT_TYPE, strContentType);
+ mHeaders.put(AbstractFileUpload.CONTENT_TYPE, strContentType);
}
@Override
diff --git a/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java b/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java
index 82d938f..ce28b54 100644
--- a/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java
+++ b/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java
@@ -37,7 +37,7 @@ import javax.portlet.PortletPreferences;
import javax.portlet.PortletSession;
import javax.portlet.WindowState;
-import org.apache.commons.fileupload2.FileUploadBase;
+import org.apache.commons.fileupload2.AbstractFileUpload;
/**
* Mock class for tests. Implements an {@link ActionRequest}.
@@ -66,7 +66,7 @@ public class MockPortletActionRequest implements ActionRequest {
this.requestData = byteArrayInputStream;
length = requestLength;
this.contentType = contentType;
- attributes.put(FileUploadBase.CONTENT_TYPE, contentType);
+ attributes.put(AbstractFileUpload.CONTENT_TYPE, contentType);
}
@Override