This is an automated email from the ASF dual-hosted git repository.
jochen 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 178ff6e FILEUPLOAD-335 - ConstantName and Operator Order
new 09d6305 Merge pull request #87 from
arturobernalg/feature/FILEUPLOAD-335
178ff6e is described below
commit 178ff6e52239ae1127ad8d77c286fe2f41fc80c4
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sat May 8 09:00:06 2021 +0200
FILEUPLOAD-335 - ConstantName and Operator Order
---
.../org/apache/commons/fileupload2/Constants.java | 2 +-
.../commons/fileupload2/DefaultFileItemTest.java | 20 ++++++++++----------
.../fileupload2/DiskFileItemSerializeTest.java | 20 ++++++++++----------
.../fileupload2/HttpServletRequestFactory.java | 4 ++--
.../commons/fileupload2/MockHttpServletRequest.java | 20 ++++++++++----------
.../commons/fileupload2/ProgressListenerTest.java | 14 +++++++-------
.../jaksrvlt/MockJakSrvltHttpRequest.java | 20 ++++++++++----------
7 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/src/test/java/org/apache/commons/fileupload2/Constants.java
b/src/test/java/org/apache/commons/fileupload2/Constants.java
index 8400bff..7389018 100644
--- a/src/test/java/org/apache/commons/fileupload2/Constants.java
+++ b/src/test/java/org/apache/commons/fileupload2/Constants.java
@@ -28,5 +28,5 @@ public final class Constants {
*/
public static final String CONTENT_TYPE = "multipart/form-data;
boundary=---1234";
- private Constants() {}
+ private Constants() { }
}
diff --git
a/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
b/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
index 8046fd0..0dd3f47 100644
--- a/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
@@ -42,17 +42,17 @@ public class DefaultFileItemTest {
/**
* Content type for regular form items.
*/
- private static final String textContentType = "text/plain";
+ private static final String TEXT_CONTENT_TYPE = "text/plain";
/**
* Content type for file uploads.
*/
- private static final String fileContentType = "application/octet-stream";
+ private static final String FILE_CONTENT_TYPE = "application/octet-stream";
/**
* Very low threshold for testing memory versus disk options.
*/
- private static final int threshold = 16;
+ private static final int THRESHOLD = 16;
/**
* Test construction of a regular text field.
@@ -64,13 +64,13 @@ public class DefaultFileItemTest {
final FileItem item = factory.createItem(
textFieldName,
- textContentType,
+ TEXT_CONTENT_TYPE,
true,
null
);
assertNotNull(item);
assertEquals(item.getFieldName(), textFieldName);
- assertEquals(item.getContentType(), textContentType);
+ assertEquals(item.getContentType(), TEXT_CONTENT_TYPE);
assertTrue(item.isFormField());
assertNull(item.getName());
}
@@ -86,13 +86,13 @@ public class DefaultFileItemTest {
final FileItem item = factory.createItem(
fileFieldName,
- fileContentType,
+ FILE_CONTENT_TYPE,
false,
fileName
);
assertNotNull(item);
assertEquals(item.getFieldName(), fileFieldName);
- assertEquals(item.getContentType(), fileContentType);
+ assertEquals(item.getContentType(), FILE_CONTENT_TYPE);
assertFalse(item.isFormField());
assertEquals(item.getName(), fileName);
}
@@ -110,7 +110,7 @@ public class DefaultFileItemTest {
final FileItem item = factory.createItem(
textFieldName,
- textContentType,
+ TEXT_CONTENT_TYPE,
true,
null
);
@@ -173,7 +173,7 @@ public class DefaultFileItemTest {
final FileItem item = factory.createItem(
textFieldName,
- textContentType,
+ TEXT_CONTENT_TYPE,
true,
null
);
@@ -219,7 +219,7 @@ public class DefaultFileItemTest {
* @return the new {@code FileItemFactory} instance.
*/
protected FileItemFactory createFactory(final File repository) {
- return new DefaultFileItemFactory(threshold, repository);
+ return new DefaultFileItemFactory(THRESHOLD, repository);
}
static final String CHARSET_ISO88591 = "ISO-8859-1";
diff --git
a/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java
b/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java
index f205b79..fcada8e 100644
---
a/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java
+++
b/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java
@@ -66,12 +66,12 @@ public class DiskFileItemSerializeTest {
/**
* Content type for regular form items.
*/
- private static final String textContentType = "text/plain";
+ private static final String TEXT_CONTENT_TYPE = "text/plain";
/**
* Very low threshold for testing memory versus disk options.
*/
- private static final int threshold = 16;
+ private static final int THRESHOLD = 16;
/**
* Helper method to test creation of a field when a repository is used.
@@ -104,7 +104,7 @@ public class DiskFileItemSerializeTest {
@Test
public void testBelowThreshold() {
// Create the FileItem
- final byte[] testFieldValueBytes = createContentBytes(threshold - 1);
+ final byte[] testFieldValueBytes = createContentBytes(THRESHOLD - 1);
testInMemoryObject(testFieldValueBytes);
}
@@ -115,7 +115,7 @@ public class DiskFileItemSerializeTest {
@Test
public void testThreshold() {
// Create the FileItem
- final byte[] testFieldValueBytes = createContentBytes(threshold);
+ final byte[] testFieldValueBytes = createContentBytes(THRESHOLD);
testInMemoryObject(testFieldValueBytes);
}
@@ -126,7 +126,7 @@ public class DiskFileItemSerializeTest {
@Test
public void testAboveThreshold() {
// Create the FileItem
- final byte[] testFieldValueBytes = createContentBytes(threshold + 1);
+ final byte[] testFieldValueBytes = createContentBytes(THRESHOLD + 1);
final FileItem item = createFileItem(testFieldValueBytes);
// Check state is as expected
@@ -147,7 +147,7 @@ public class DiskFileItemSerializeTest {
@Test
public void testValidRepository() {
// Create the FileItem
- final byte[] testFieldValueBytes = createContentBytes(threshold);
+ final byte[] testFieldValueBytes = createContentBytes(THRESHOLD);
testInMemoryObject(testFieldValueBytes, REPO);
}
@@ -157,7 +157,7 @@ public class DiskFileItemSerializeTest {
@Test
public void testInvalidRepository() {
// Create the FileItem
- final byte[] testFieldValueBytes = createContentBytes(threshold);
+ final byte[] testFieldValueBytes = createContentBytes(THRESHOLD);
final File repository = new File(System.getProperty("java.io.tmpdir"),
"file");
final FileItem item = createFileItem(testFieldValueBytes, repository);
assertThrows(IOException.class, () -> deserialize(serialize(item)));
@@ -169,7 +169,7 @@ public class DiskFileItemSerializeTest {
@Test
public void testInvalidRepositoryWithNullChar() {
// Create the FileItem
- final byte[] testFieldValueBytes = createContentBytes(threshold);
+ final byte[] testFieldValueBytes = createContentBytes(THRESHOLD);
final File repository = new File(System.getProperty("java.io.tmpdir"),
"\0");
final FileItem item = createFileItem(testFieldValueBytes, repository);
assertThrows(IOException.class, () -> deserialize(serialize(item)));
@@ -207,12 +207,12 @@ public class DiskFileItemSerializeTest {
* Create a FileItem with the specfied content bytes and repository.
*/
private FileItem createFileItem(final byte[] contentBytes, final File
repository) {
- final FileItemFactory factory = new DiskFileItemFactory(threshold,
repository);
+ final FileItemFactory factory = new DiskFileItemFactory(THRESHOLD,
repository);
final String textFieldName = "textField";
final FileItem item = factory.createItem(
textFieldName,
- textContentType,
+ TEXT_CONTENT_TYPE,
true,
"My File Name"
);
diff --git
a/src/test/java/org/apache/commons/fileupload2/HttpServletRequestFactory.java
b/src/test/java/org/apache/commons/fileupload2/HttpServletRequestFactory.java
index 63877bb..e66cd57 100644
---
a/src/test/java/org/apache/commons/fileupload2/HttpServletRequestFactory.java
+++
b/src/test/java/org/apache/commons/fileupload2/HttpServletRequestFactory.java
@@ -20,14 +20,14 @@ import javax.servlet.http.HttpServletRequest;
final class HttpServletRequestFactory {
- static public HttpServletRequest
createHttpServletRequestWithNullContentType() {
+ public static HttpServletRequest
createHttpServletRequestWithNullContentType() {
final byte[] requestData = "foobar".getBytes();
return new MockHttpServletRequest(
requestData,
null);
}
- static public HttpServletRequest createValidHttpServletRequest(
+ public static HttpServletRequest createValidHttpServletRequest(
final String[] strFileNames) {
// todo - provide a real implementation
diff --git
a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
index b397941..b43e231 100644
--- a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
+++ b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
@@ -34,15 +34,15 @@ import javax.servlet.http.HttpSession;
public class MockHttpServletRequest implements HttpServletRequest {
- private final InputStream m_requestData;
+ private final InputStream mmRequestData;
private long length;
- private final String m_strContentType;
+ private final String mStrContentType;
private int readLimit = -1;
- private final Map<String, String> m_headers = new java.util.HashMap<>();
+ private final Map<String, String> mHeaders = new java.util.HashMap<>();
/**
* Creates a new instance with the given request data
@@ -63,10 +63,10 @@ public class MockHttpServletRequest implements
HttpServletRequest {
final InputStream requestData,
final long requestLength,
final String strContentType) {
- m_requestData = requestData;
+ mmRequestData = requestData;
length = requestLength;
- m_strContentType = strContentType;
- m_headers.put(FileUploadBase.CONTENT_TYPE, strContentType);
+ mStrContentType = strContentType;
+ mHeaders.put(FileUploadBase.CONTENT_TYPE, strContentType);
}
/**
@@ -98,7 +98,7 @@ public class MockHttpServletRequest implements
HttpServletRequest {
*/
@Override
public String getHeader(final String headerName) {
- return m_headers.get(headerName);
+ return mHeaders.get(headerName);
}
/**
@@ -312,7 +312,7 @@ public class MockHttpServletRequest implements
HttpServletRequest {
public int getContentLength() {
int iLength;
- if (null == m_requestData) {
+ if (null == mmRequestData) {
iLength = -1;
} else {
if (length > Integer.MAX_VALUE) {
@@ -335,7 +335,7 @@ public class MockHttpServletRequest implements
HttpServletRequest {
*/
@Override
public String getContentType() {
- return m_strContentType;
+ return mStrContentType;
}
/**
@@ -343,7 +343,7 @@ public class MockHttpServletRequest implements
HttpServletRequest {
*/
@Override
public ServletInputStream getInputStream() throws IOException {
- return new MyServletInputStream(m_requestData, readLimit);
+ return new MyServletInputStream(mmRequestData, readLimit);
}
/**
diff --git
a/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java
b/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java
index 02809a5..4084c5d 100644
--- a/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java
@@ -72,9 +72,9 @@ public class ProgressListenerTest {
*/
@Test
public void testProgressListener() throws Exception {
- final int NUM_ITEMS = 512;
+ final int numItems = 512;
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- for (int i = 0; i < NUM_ITEMS; i++) {
+ for (int i = 0; i < numItems; i++) {
final String header = "-----1234\r\n"
+ "Content-Disposition: form-data; name=\"field" + (i+1) +
"\"\r\n"
+ "\r\n";
@@ -88,22 +88,22 @@ public class ProgressListenerTest {
final byte[] contents = baos.toByteArray();
MockHttpServletRequest request = new MockHttpServletRequest(contents,
Constants.CONTENT_TYPE);
- runTest(NUM_ITEMS, contents.length, request);
+ runTest(numItems, contents.length, request);
request = new MockHttpServletRequest(contents, Constants.CONTENT_TYPE){
@Override
public int getContentLength() {
return -1;
}
};
- runTest(NUM_ITEMS, contents.length, request);
+ runTest(numItems, contents.length, request);
}
- private void runTest(final int NUM_ITEMS, final long pContentLength, final
MockHttpServletRequest request) throws FileUploadException, IOException {
+ private void runTest(final int numItems, final long pContentLength, final
MockHttpServletRequest request) throws FileUploadException, IOException {
final ServletFileUpload upload = new ServletFileUpload();
- final ProgressListenerImpl listener = new
ProgressListenerImpl(pContentLength, NUM_ITEMS);
+ final ProgressListenerImpl listener = new
ProgressListenerImpl(pContentLength, numItems);
upload.setProgressListener(listener);
final FileItemIterator iter = upload.getItemIterator(request);
- for (int i = 0; i < NUM_ITEMS; i++) {
+ for (int i = 0; i < numItems; 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/jaksrvlt/MockJakSrvltHttpRequest.java
b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
index a4dcc5e..1838682 100644
---
a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
+++
b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
@@ -48,15 +48,15 @@ import jakarta.servlet.http.Part;
public class MockJakSrvltHttpRequest implements HttpServletRequest {
- private final InputStream m_requestData;
+ private final InputStream mRequestData;
private long length;
- private final String m_strContentType;
+ private final String mStrContentType;
private int readLimit = -1;
- private final Map<String, String> m_headers = new java.util.HashMap<>();
+ private final Map<String, String> mHeaders = new java.util.HashMap<>();
/**
* Creates a new instance with the given request data
@@ -77,10 +77,10 @@ public class MockJakSrvltHttpRequest implements
HttpServletRequest {
final InputStream requestData,
final long requestLength,
final String strContentType) {
- m_requestData = requestData;
+ mRequestData = requestData;
length = requestLength;
- m_strContentType = strContentType;
- m_headers.put(FileUploadBase.CONTENT_TYPE, strContentType);
+ mStrContentType = strContentType;
+ mHeaders.put(FileUploadBase.CONTENT_TYPE, strContentType);
}
/**
@@ -112,7 +112,7 @@ public class MockJakSrvltHttpRequest implements
HttpServletRequest {
*/
@Override
public String getHeader(final String headerName) {
- return m_headers.get(headerName);
+ return mHeaders.get(headerName);
}
/**
@@ -326,7 +326,7 @@ public class MockJakSrvltHttpRequest implements
HttpServletRequest {
public int getContentLength() {
int iLength;
- if (null == m_requestData) {
+ if (null == mRequestData) {
iLength = -1;
} else {
if (length > Integer.MAX_VALUE) {
@@ -349,7 +349,7 @@ public class MockJakSrvltHttpRequest implements
HttpServletRequest {
*/
@Override
public String getContentType() {
- return m_strContentType;
+ return mStrContentType;
}
/**
@@ -357,7 +357,7 @@ public class MockJakSrvltHttpRequest implements
HttpServletRequest {
*/
@Override
public ServletInputStream getInputStream() throws IOException {
- return (ServletInputStream) new MyServletInputStream(m_requestData,
readLimit);
+ return (ServletInputStream) new MyServletInputStream(mRequestData,
readLimit);
}
/**
