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:11:59 UTC
[commons-fileupload] branch master updated: Normalize parameter 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
The following commit(s) were added to refs/heads/master by this push:
new 5098dff Normalize parameter names
5098dff is described below
commit 5098dffa47694aca31fcf2c257f9984541bc12a1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Apr 5 19:11:57 2023 -0400
Normalize parameter names
---
.../commons/fileupload2/FileItemIterator.java | 8 +++---
.../apache/commons/fileupload2/FileUploadBase.java | 26 +++++++++----------
.../fileupload2/InvalidFileNameException.java | 10 ++++----
.../commons/fileupload2/MultipartStream.java | 12 ++++-----
.../commons/fileupload2/disk/DiskFileItem.java | 8 +++---
.../fileupload2/disk/DiskFileItemFactory.java | 12 ++++-----
.../fileupload2/impl/FileItemIteratorImpl.java | 10 ++++----
.../fileupload2/impl/FileItemStreamImpl.java | 20 +++++++--------
.../fileupload2/jaksrvlt/JakSrvltFileCleaner.java | 16 ++++++------
.../fileupload2/servlet/FileCleanerCleanup.java | 16 ++++++------
.../apache/commons/fileupload2/FileUploadTest.java | 12 ++++-----
.../fileupload2/MockHttpServletRequest.java | 12 ++++-----
.../commons/fileupload2/ProgressListenerTest.java | 30 +++++++++++-----------
.../apache/commons/fileupload2/StreamingTest.java | 24 ++++++++---------
.../jaksrvlt/MockJakSrvltHttpRequest.java | 12 ++++-----
15 files changed, 114 insertions(+), 114 deletions(-)
diff --git a/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java b/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
index 5ac94eb..c1c7218 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
@@ -86,9 +86,9 @@ public interface FileItemIterator {
* <p>
* <em>Note:</em> Changing this value doesn't affect files, that have already been uploaded.
* </p>
- * @param pFileSizeMax The maximum size of a single, uploaded file. The value -1 indicates "unlimited".
+ * @param fileSizeMax The maximum size of a single, uploaded file. The value -1 indicates "unlimited".
*/
- void setFileSizeMax(long pFileSizeMax);
+ void setFileSizeMax(long fileSizeMax);
/**
* Sets the maximum size of the complete HTTP request. A {@link SizeLimitExceededException}
@@ -101,7 +101,7 @@ public interface FileItemIterator {
* yet initialized. In other words: If the methods {@link #hasNext()}, {@link #next()} have not
* yet been invoked.
* </p>
- * @param pSizeMax The maximum size of the complete HTTP request. The value -1 indicates "unlimited".
+ * @param sizeMax The maximum size of the complete HTTP request. The value -1 indicates "unlimited".
*/
- void setSizeMax(long pSizeMax);
+ void setSizeMax(long sizeMax);
}
diff --git a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
index 5f35d1d..4e28490 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
@@ -178,17 +178,17 @@ public abstract class FileUploadBase {
* Gets the field name, which is given by the content-disposition
* header.
*
- * @param pContentDisposition The content-dispositions header value.
+ * @param contentDisposition The content-dispositions header value.
* @return The field jake
*/
- private String getFieldName(final String pContentDisposition) {
+ private String getFieldName(final String contentDisposition) {
String fieldName = null;
- if (pContentDisposition != null
- && pContentDisposition.toLowerCase(Locale.ENGLISH).startsWith(FORM_DATA)) {
+ if (contentDisposition != null
+ && contentDisposition.toLowerCase(Locale.ENGLISH).startsWith(FORM_DATA)) {
final ParameterParser parser = new ParameterParser();
parser.setLowerCaseNames(true);
// Parameter parser can handle null input
- final Map<String, String> params = parser.parse(pContentDisposition, ';');
+ final Map<String, String> params = parser.parse(contentDisposition, ';');
fieldName = params.get("name");
if (fieldName != null) {
fieldName = fieldName.trim();
@@ -227,18 +227,18 @@ public abstract class FileUploadBase {
/**
* Gets the given content-disposition headers file name.
- * @param pContentDisposition The content-disposition headers value.
+ * @param contentDisposition The content-disposition headers value.
* @return The file name
*/
- private String getFileName(final String pContentDisposition) {
+ private String getFileName(final String contentDisposition) {
String fileName = null;
- if (pContentDisposition != null) {
- final String cdl = pContentDisposition.toLowerCase(Locale.ENGLISH);
+ if (contentDisposition != null) {
+ final String cdl = contentDisposition.toLowerCase(Locale.ENGLISH);
if (cdl.startsWith(FORM_DATA) || cdl.startsWith(ATTACHMENT)) {
final ParameterParser parser = new ParameterParser();
parser.setLowerCaseNames(true);
// Parameter parser can handle null input
- final Map<String, String> params = parser.parse(pContentDisposition, ';');
+ final Map<String, String> params = parser.parse(contentDisposition, ';');
if (params.containsKey("filename")) {
fileName = params.get("filename");
if (fileName != null) {
@@ -536,10 +536,10 @@ public abstract class FileUploadBase {
/**
* Sets the progress listener.
*
- * @param pListener The progress listener, if any. Defaults to null.
+ * @param listener The progress listener, if any. Defaults to null.
*/
- public void setProgressListener(final ProgressListener pListener) {
- listener = pListener;
+ public void setProgressListener(final ProgressListener listener) {
+ this.listener = listener;
}
/**
diff --git a/src/main/java/org/apache/commons/fileupload2/InvalidFileNameException.java b/src/main/java/org/apache/commons/fileupload2/InvalidFileNameException.java
index 1191f71..3937ab6 100644
--- a/src/main/java/org/apache/commons/fileupload2/InvalidFileNameException.java
+++ b/src/main/java/org/apache/commons/fileupload2/InvalidFileNameException.java
@@ -42,12 +42,12 @@ public class InvalidFileNameException extends RuntimeException {
/**
* Constructs a new instance.
*
- * @param pName The file name causing the exception.
- * @param pMessage A human readable error message.
+ * @param name The file name causing the exception.
+ * @param message A human readable error message.
*/
- public InvalidFileNameException(final String pName, final String pMessage) {
- super(pMessage);
- name = pName;
+ public InvalidFileNameException(final String name, final String message) {
+ super(message);
+ this.name = name;
}
/**
diff --git a/src/main/java/org/apache/commons/fileupload2/MultipartStream.java b/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
index 9ce56a7..a9b56af 100644
--- a/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
+++ b/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
@@ -410,13 +410,13 @@ public class MultipartStream {
/**
* Called to indicate that bytes have been read.
*
- * @param pBytes Number of bytes, which have been read.
+ * @param byteCount Number of bytes, which have been read.
*/
- void noteBytesRead(final int pBytes) {
+ void noteBytesRead(final int byteCount) {
/*
* Indicates, that the given number of bytes have been read from the input stream.
*/
- bytesRead += pBytes;
+ bytesRead += byteCount;
notifyListener();
}
@@ -569,11 +569,11 @@ public class MultipartStream {
* @param input The {@code InputStream} to serve as a data source.
* @param boundary The token used for dividing the stream into {@code encapsulations}.
* @param bufferSize The size of the buffer to be used, in bytes.
- * @param pNotifier The notifier, which is used for calling the progress listener, if any.
+ * @param notifier The notifier, which is used for calling the progress listener, if any.
* @throws IllegalArgumentException If the buffer size is too small.
* @since 1.3.1
*/
- public MultipartStream(final InputStream input, final byte[] boundary, final int bufferSize, final ProgressNotifier pNotifier) {
+ public MultipartStream(final InputStream input, final byte[] boundary, final int bufferSize, final ProgressNotifier notifier) {
if (boundary == null) {
throw new IllegalArgumentException("boundary may not be null");
@@ -588,7 +588,7 @@ public class MultipartStream {
this.input = input;
this.bufSize = Math.max(bufferSize, boundaryLength * 2);
this.buffer = new byte[this.bufSize];
- this.notifier = pNotifier;
+ this.notifier = notifier;
this.boundary = new byte[this.boundaryLength];
this.boundaryTable = new int[this.boundaryLength + 1];
diff --git a/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java b/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
index 12f0d75..518d1ae 100644
--- a/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
+++ b/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
@@ -526,11 +526,11 @@ public class DiskFileItem implements FileItem {
/**
* Sets the file item headers.
*
- * @param pHeaders The file items headers.
+ * @param headers The file items headers.
*/
@Override
- public void setHeaders(final FileItemHeaders pHeaders) {
- headers = pHeaders;
+ public void setHeaders(final FileItemHeaders headers) {
+ this.headers = headers;
}
/**
@@ -602,7 +602,7 @@ public class DiskFileItem implements FileItem {
*/
public static String checkFileName(final String fileName) {
if (fileName != null && fileName.indexOf('\u0000') != -1) {
- // pFileName.replace("\u0000", "\\0")
+ // fileName.replace("\u0000", "\\0")
final StringBuilder sb = new StringBuilder();
for (int i = 0; i < fileName.length(); i++) {
final char c = fileName.charAt(i);
diff --git a/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItemFactory.java b/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItemFactory.java
index dcc8f4c..d139a1b 100644
--- a/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItemFactory.java
+++ b/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItemFactory.java
@@ -199,22 +199,22 @@ public class DiskFileItemFactory implements FileItemFactory {
/**
* Sets the default charset for use when no explicit charset
* parameter is provided by the sender.
- * @param pCharset the default charset
+ * @param charset the default charset
*/
- public void setDefaultCharset(final String pCharset) {
- defaultCharset = pCharset;
+ public void setDefaultCharset(final String charset) {
+ defaultCharset = charset;
}
/**
* Sets the tracker, which is responsible for deleting temporary
* files.
*
- * @param pTracker An instance of {@link FileCleaningTracker},
+ * @param tracker An instance of {@link FileCleaningTracker},
* which will from now on track the created files, or null
* (default), to disable tracking.
*/
- public void setFileCleaningTracker(final FileCleaningTracker pTracker) {
- fileCleaningTracker = pTracker;
+ public void setFileCleaningTracker(final FileCleaningTracker tracker) {
+ fileCleaningTracker = tracker;
}
/**
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 fff73e9..9aa60fe 100644
--- a/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
+++ b/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
@@ -196,9 +196,9 @@ public class FileItemIteratorImpl implements FileItemIterator {
}
}
- private long getContentLength(final FileItemHeaders pHeaders) {
+ private long getContentLength(final FileItemHeaders headers) {
try {
- return Long.parseLong(pHeaders.getHeader(FileUploadBase.CONTENT_LENGTH));
+ return Long.parseLong(headers.getHeader(FileUploadBase.CONTENT_LENGTH));
} catch (final Exception e) {
return -1;
}
@@ -249,7 +249,7 @@ public class FileItemIteratorImpl implements FileItemIterator {
return findNextItem();
}
- protected void init(final FileUploadBase fileUploadBase, final RequestContext pRequestContext) throws FileUploadException, IOException {
+ protected void init(final FileUploadBase fileUploadBase, final RequestContext requestContext) throws FileUploadException, IOException {
final String contentType = ctx.getContentType();
if ((null == contentType) || (!contentType.toLowerCase(Locale.ENGLISH).startsWith(FileUploadBase.MULTIPART))) {
throw new FileUploadContentTypeException(format("the request doesn't contain a %s or %s stream, content type header is %s",
@@ -273,9 +273,9 @@ public class FileItemIteratorImpl implements FileItemIterator {
// N.B. this is eventually closed in MultipartStream processing
input = new LimitedInputStream(ctx.getInputStream(), sizeMax) {
@Override
- protected void raiseError(final long pSizeMax, final long pCount) throws IOException {
+ protected void raiseError(final long maxLen, final long count) throws IOException {
throw new FileUploadSizeException(
- format("The request was rejected because its size (%s) exceeds the configured maximum (%s)", pCount, pSizeMax), pSizeMax, pCount);
+ format("The request was rejected because its size (%s) exceeds the configured maximum (%s)", count, maxLen), maxLen, count);
}
};
} else {
diff --git a/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java b/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
index 3572a05..c389960 100644
--- a/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
+++ b/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
@@ -81,26 +81,26 @@ public class FileItemStreamImpl implements FileItemStream {
* Creates a new instance.
*
* @param fileItemIterator The {@link FileItemIteratorImpl iterator}, which returned this file item.
- * @param pFileName The items file name, or null.
- * @param pFieldName The items field name.
+ * @param fileName The items file name, or null.
+ * @param fieldName The items field name.
* @param contentType The items content type, or null.
* @param formField Whether the item is a form field.
* @param contentLength The items content length, if known, or -1
* @throws IOException Creating the file item failed.
* @throws FileUploadException Parsing the incoming data stream failed.
*/
- public FileItemStreamImpl(final FileItemIteratorImpl fileItemIterator, final String pFileName, final String pFieldName, final String contentType,
+ public FileItemStreamImpl(final FileItemIteratorImpl fileItemIterator, final String fileName, final String fieldName, final String contentType,
final boolean formField, final long contentLength) throws FileUploadException, IOException {
this.fileItemIteratorImpl = fileItemIterator;
- this.fileName = pFileName;
- this.fieldName = pFieldName;
+ this.fileName = fileName;
+ this.fieldName = fieldName;
this.contentType = contentType;
this.formField = formField;
final long fileSizeMax = fileItemIteratorImpl.getFileSizeMax();
if (fileSizeMax != -1 && contentLength != -1 && contentLength > fileSizeMax) {
throw new FileUploadByteCountLimitException(
- format("The field %s exceeds its maximum permitted size of %s bytes.", fieldName, fileSizeMax), contentLength, fileSizeMax, pFileName,
- pFieldName);
+ format("The field %s exceeds its maximum permitted size of %s bytes.", fieldName, fileSizeMax), contentLength, fileSizeMax, fileName,
+ fieldName);
}
// OK to construct stream now
final ItemInputStream itemInputStream = fileItemIteratorImpl.getMultiPartStream().newInputStream();
@@ -197,11 +197,11 @@ public class FileItemStreamImpl implements FileItemStream {
/**
* Sets the file item headers.
*
- * @param pHeaders The items header object
+ * @param headers The items header object
*/
@Override
- public void setHeaders(final FileItemHeaders pHeaders) {
- headers = pHeaders;
+ public void setHeaders(final FileItemHeaders headers) {
+ this.headers = headers;
}
}
diff --git a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileCleaner.java b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileCleaner.java
index f213f01..8a8d1bf 100644
--- a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileCleaner.java
+++ b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileCleaner.java
@@ -41,25 +41,25 @@ public class JakSrvltFileCleaner implements ServletContextListener {
* Gets the instance of {@link FileCleaningTracker}, which is
* associated with the given {@link ServletContext}.
*
- * @param pServletContext The servlet context to query
+ * @param servletContext The servlet context to query
* @return The contexts tracker
*/
public static FileCleaningTracker
- getFileCleaningTracker(final ServletContext pServletContext) {
+ getFileCleaningTracker(final ServletContext servletContext) {
return (FileCleaningTracker)
- pServletContext.getAttribute(FILE_CLEANING_TRACKER_ATTRIBUTE);
+ servletContext.getAttribute(FILE_CLEANING_TRACKER_ATTRIBUTE);
}
/**
* Sets the instance of {@link FileCleaningTracker}, which is
* associated with the given {@link ServletContext}.
*
- * @param pServletContext The servlet context to modify
- * @param pTracker The tracker to set
+ * @param servletContext The servlet context to modify
+ * @param tracker The tracker to set
*/
- public static void setFileCleaningTracker(final ServletContext pServletContext,
- final FileCleaningTracker pTracker) {
- pServletContext.setAttribute(FILE_CLEANING_TRACKER_ATTRIBUTE, pTracker);
+ public static void setFileCleaningTracker(final ServletContext servletContext,
+ final FileCleaningTracker tracker) {
+ servletContext.setAttribute(FILE_CLEANING_TRACKER_ATTRIBUTE, tracker);
}
/**
diff --git a/src/main/java/org/apache/commons/fileupload2/servlet/FileCleanerCleanup.java b/src/main/java/org/apache/commons/fileupload2/servlet/FileCleanerCleanup.java
index 7f695b6..fcc302e 100644
--- a/src/main/java/org/apache/commons/fileupload2/servlet/FileCleanerCleanup.java
+++ b/src/main/java/org/apache/commons/fileupload2/servlet/FileCleanerCleanup.java
@@ -40,25 +40,25 @@ public class FileCleanerCleanup implements ServletContextListener {
* Gets the instance of {@link FileCleaningTracker}, which is
* associated with the given {@link ServletContext}.
*
- * @param pServletContext The servlet context to query
+ * @param servletContext The servlet context to query
* @return The contexts tracker
*/
public static FileCleaningTracker
- getFileCleaningTracker(final ServletContext pServletContext) {
+ getFileCleaningTracker(final ServletContext servletContext) {
return (FileCleaningTracker)
- pServletContext.getAttribute(FILE_CLEANING_TRACKER_ATTRIBUTE);
+ servletContext.getAttribute(FILE_CLEANING_TRACKER_ATTRIBUTE);
}
/**
* Sets the instance of {@link FileCleaningTracker}, which is
* associated with the given {@link ServletContext}.
*
- * @param pServletContext The servlet context to modify
- * @param pTracker The tracker to set
+ * @param servletContext The servlet context to modify
+ * @param tracker The tracker to set
*/
- public static void setFileCleaningTracker(final ServletContext pServletContext,
- final FileCleaningTracker pTracker) {
- pServletContext.setAttribute(FILE_CLEANING_TRACKER_ATTRIBUTE, pTracker);
+ public static void setFileCleaningTracker(final ServletContext servletContext,
+ final FileCleaningTracker tracker) {
+ servletContext.setAttribute(FILE_CLEANING_TRACKER_ATTRIBUTE, tracker);
}
/**
diff --git a/src/test/java/org/apache/commons/fileupload2/FileUploadTest.java b/src/test/java/org/apache/commons/fileupload2/FileUploadTest.java
index 3c1310e..4e837bf 100644
--- a/src/test/java/org/apache/commons/fileupload2/FileUploadTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/FileUploadTest.java
@@ -49,12 +49,12 @@ public class FileUploadTest {
return Util.fileUploadImplementations().stream();
}
- private void assertHeaders(final String[] pHeaderNames, final String[] pHeaderValues,
- final FileItem pItem, final int pIndex) {
- for (int i = 0; i < pHeaderNames.length; i++) {
- final String value = pItem.getHeaders().getHeader(pHeaderNames[i]);
- if (i == pIndex) {
- assertEquals(pHeaderValues[i], value);
+ private void assertHeaders(final String[] headerNames, final String[] headerValues,
+ final FileItem fileItems, final int index) {
+ for (int i = 0; i < headerNames.length; i++) {
+ final String value = fileItems.getHeaders().getHeader(headerNames[i]);
+ if (i == index) {
+ assertEquals(headerValues[i], value);
} else {
assertNull(value);
}
diff --git a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
index d50f2ab..24702f1 100644
--- a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
+++ b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
@@ -37,29 +37,29 @@ public class MockHttpServletRequest implements HttpServletRequest {
private static class MyServletInputStream
extends javax.servlet.ServletInputStream {
- private final InputStream in;
+ private final InputStream inputStream;
private final int readLimit;
/**
* Creates a new instance, which returns the given
* streams data.
*/
- public MyServletInputStream(final InputStream pStream, final int readLimit) {
- in = pStream;
+ public MyServletInputStream(final InputStream inputStream, final int readLimit) {
+ this.inputStream = inputStream;
this.readLimit = readLimit;
}
@Override
public int read() throws IOException {
- return in.read();
+ return inputStream.read();
}
@Override
public int read(final byte[] b, final int off, final int len) throws IOException {
if (readLimit > 0) {
- return in.read(b, off, Math.min(readLimit, len));
+ return inputStream.read(b, off, Math.min(readLimit, len));
}
- return in.read(b, off, len);
+ return inputStream.read(b, off, len);
}
}
diff --git a/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java b/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java
index c603dea..ef5b4d1 100644
--- a/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java
@@ -43,9 +43,9 @@ public class ProgressListenerTest {
private Integer items;
- ProgressListenerImpl(final long pContentLength, final int pItems) {
- expectedContentLength = pContentLength;
- expectedItems = pItems;
+ ProgressListenerImpl(final long contentLength, final int itemCount) {
+ expectedContentLength = contentLength;
+ expectedItems = itemCount;
}
void checkFinished() {
@@ -54,25 +54,25 @@ public class ProgressListenerTest {
}
@Override
- public void update(final long pBytesRead, final long pContentLength, final int pItems) {
- assertTrue(pBytesRead >= 0 && pBytesRead <= expectedContentLength);
- assertTrue(pContentLength == -1 || pContentLength == expectedContentLength);
- assertTrue(pItems >= 0 && pItems <= expectedItems);
-
- assertTrue(bytesRead == null || pBytesRead >= bytesRead.longValue());
- bytesRead = Long.valueOf(pBytesRead);
- assertTrue(items == null || pItems >= items.intValue());
- items = Integer.valueOf(pItems);
+ public void update(final long actualBytesRead, final long actualContentLength, final int actualItems) {
+ assertTrue(actualBytesRead >= 0 && actualBytesRead <= expectedContentLength);
+ assertTrue(actualContentLength == -1 || actualContentLength == expectedContentLength);
+ assertTrue(actualItems >= 0 && actualItems <= expectedItems);
+
+ assertTrue(bytesRead == null || actualBytesRead >= bytesRead.longValue());
+ bytesRead = Long.valueOf(actualBytesRead);
+ assertTrue(items == null || actualItems >= items.intValue());
+ items = Integer.valueOf(actualItems);
}
}
- private void runTest(final int NUM_ITEMS, final long pContentLength, final MockHttpServletRequest request) throws FileUploadException, IOException {
+ private void runTest(final int itemCount, final long contentLength, final MockHttpServletRequest request) throws FileUploadException, IOException {
final ServletFileUpload upload = new ServletFileUpload();
- final ProgressListenerImpl listener = new ProgressListenerImpl(pContentLength, NUM_ITEMS);
+ final ProgressListenerImpl listener = new ProgressListenerImpl(contentLength, itemCount);
upload.setProgressListener(listener);
final FileItemIterator iter = upload.getItemIterator(request);
- for (int i = 0; i < NUM_ITEMS; i++) {
+ for (int i = 0; i < itemCount; i++) {
final FileItemStream stream = iter.next();
final InputStream istream = stream.openStream();
for (int j = 0; j < 16384 + i; j++) {
diff --git a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
index f76c9b7..e6cc4bc 100644
--- a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
@@ -46,9 +46,9 @@ public class StreamingTest {
return "-----1234--\r\n";
}
- private String getHeader(final String pField) {
+ private String getHeader(final String value) {
return "-----1234\r\n"
- + "Content-Disposition: form-data; name=\"" + pField + "\"\r\n"
+ + "Content-Disposition: form-data; name=\"" + value + "\"\r\n"
+ "\r\n";
}
@@ -89,26 +89,26 @@ public class StreamingTest {
return parseUpload(new ByteArrayInputStream(bytes), bytes.length);
}
- private List<FileItem> parseUpload(final InputStream pStream, final int pLength)
+ private List<FileItem> parseUpload(final InputStream inputStream, final int length)
throws FileUploadException {
final String contentType = "multipart/form-data; boundary=---1234";
final FileUploadBase upload = new ServletFileUpload();
upload.setFileItemFactory(new DiskFileItemFactory());
- final HttpServletRequest request = new MockHttpServletRequest(pStream,
- pLength, contentType);
+ final HttpServletRequest request = new MockHttpServletRequest(inputStream,
+ length, contentType);
return upload.parseRequest(new ServletRequestContext(request));
}
- private FileItemIterator parseUpload(final int pLength, final InputStream pStream)
+ private FileItemIterator parseUpload(final int length, final InputStream inputStream)
throws FileUploadException, IOException {
final String contentType = "multipart/form-data; boundary=---1234";
final FileUploadBase upload = new ServletFileUpload();
upload.setFileItemFactory(new DiskFileItemFactory());
- final HttpServletRequest request = new MockHttpServletRequest(pStream,
- pLength, contentType);
+ final HttpServletRequest request = new MockHttpServletRequest(inputStream,
+ length, contentType);
return upload.getItemIterator(new ServletRequestContext(request));
}
@@ -257,16 +257,16 @@ public class StreamingTest {
return super.read();
}
@Override
- public int read(final byte[] pB, final int pOff, final int pLen)
+ public int read(final byte[] buffer, final int offset, final int length)
throws IOException {
- for (int i = 0; i < pLen; i++) {
+ for (int i = 0; i < length; i++) {
final int res = read();
if (res == -1) {
return i == 0 ? -1 : i;
}
- pB[pOff + i] = (byte) res;
+ buffer[offset + i] = (byte) res;
}
- return pLen;
+ return length;
}
};
try {
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 f8a5982..73c58cf 100644
--- a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
+++ b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
@@ -50,15 +50,15 @@ public class MockJakSrvltHttpRequest implements HttpServletRequest {
private static class MyServletInputStream
extends jakarta.servlet.ServletInputStream {
- private final InputStream in;
+ private final InputStream inputStream;
private final int readLimit;
/**
* Creates a new instance, which returns the given
* streams data.
*/
- public MyServletInputStream(final InputStream pStream, final int readLimit) {
- in = pStream;
+ public MyServletInputStream(final InputStream inputStream, final int readLimit) {
+ this.inputStream = inputStream;
this.readLimit = readLimit;
}
@@ -74,15 +74,15 @@ public class MockJakSrvltHttpRequest implements HttpServletRequest {
@Override
public int read() throws IOException {
- return in.read();
+ return inputStream.read();
}
@Override
public int read(final byte[] b, final int off, final int len) throws IOException {
if (readLimit > 0) {
- return in.read(b, off, Math.min(readLimit, len));
+ return inputStream.read(b, off, Math.min(readLimit, len));
}
- return in.read(b, off, len);
+ return inputStream.read(b, off, len);
}
@Override