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 6b1eb55 Improvements: Use Lambda
new 4a0264e Merge pull request #96 from arturobernalg/feature/improvements
6b1eb55 is described below
commit 6b1eb55b4878869f7c364278c20d54e242cae242
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Thu May 27 21:35:34 2021 +0200
Improvements:
Use Lambda
* Fix javadoc
* Remove Redundant type cast
* Remove unnecessarily escaped character
* Remove redundant type cast
* Remove redundant String operation
---
.../org/apache/commons/fileupload2/FileUploadBase.java | 5 ++---
.../commons/fileupload2/util/mime/MimeUtility.java | 4 ++--
.../apache/commons/fileupload2/ParameterParserTest.java | 16 ++++++++--------
.../fileupload2/jaksrvlt/JakSrvltFileUploadTest.java | 2 +-
.../fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java | 4 ++--
.../fileupload2/util/mime/RFC2231UtilityTestCase.java | 4 +---
6 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
index f90e7e1..1626077 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
@@ -31,7 +31,6 @@ import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.fileupload2.impl.FileItemIteratorImpl;
-import org.apache.commons.fileupload2.impl.FileItemStreamImpl;
import org.apache.commons.fileupload2.impl.FileUploadIOException;
import org.apache.commons.fileupload2.impl.IOFileUploadException;
import org.apache.commons.fileupload2.servlet.ServletFileUpload;
@@ -333,7 +332,7 @@ public abstract class FileUploadBase {
while (iter.hasNext()) {
final FileItemStream item = iter.next();
// Don't use getName() here to prevent an
InvalidFileNameException.
- final String fileName = ((FileItemStreamImpl) item).getName();
+ final String fileName = item.getName();
final FileItem fileItem =
fileItemFactory.createItem(item.getFieldName(), item.getContentType(),
item.isFormField(),
fileName);
items.add(fileItem);
@@ -585,7 +584,7 @@ public abstract class FileUploadBase {
}
// Continuation line found
end = parseEndOfLine(headerPart, nonWs);
- header.append(" ").append(headerPart.substring(nonWs, end));
+ header.append(" ").append(headerPart, nonWs, end);
start = end + 2;
}
parseHeaderLine(headers, header.toString());
diff --git
a/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
b/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
index c3f2387..57a3319 100644
--- a/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
+++ b/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
@@ -150,7 +150,7 @@ public final class MimeUtility {
// are any whitespace characters significant? Append
'em if we've got 'em.
if (!previousTokenEncoded && startWhiteSpace != -1) {
- decodedText.append(text.substring(startWhiteSpace,
endWhiteSpace));
+ decodedText.append(text, startWhiteSpace,
endWhiteSpace);
startWhiteSpace = -1;
}
// this is definitely a decoded token.
@@ -168,7 +168,7 @@ public final class MimeUtility {
// this is a normal token, so it doesn't matter what the
previous token was. Add the white space
// if we have it.
if (startWhiteSpace != -1) {
- decodedText.append(text.substring(startWhiteSpace,
endWhiteSpace));
+ decodedText.append(text, startWhiteSpace, endWhiteSpace);
startWhiteSpace = -1;
}
// this is not a decoded token.
diff --git
a/src/test/java/org/apache/commons/fileupload2/ParameterParserTest.java
b/src/test/java/org/apache/commons/fileupload2/ParameterParserTest.java
index bfab434..1edbfda 100644
--- a/src/test/java/org/apache/commons/fileupload2/ParameterParserTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/ParameterParserTest.java
@@ -129,29 +129,29 @@ public class ParameterParserTest {
// Should parse a UTF-8 charset
String s = "Content-Disposition: form-data; "
- + "name=\"file\";
filename*=UTF-8\'\'%E3%81%93%E3%82%93%E3%81%AB%E3%81%A1%E3%81%AF\r\n";
+ + "name=\"file\";
filename*=UTF-8''%E3%81%93%E3%82%93%E3%81%AB%E3%81%A1%E3%81%AF\r\n";
Map<String, String> params = parser.parse(s, new char[] { ',', ';' });
assertEquals("\u3053\u3093\u306B\u3061\u306F",
params.get("filename")); //filename = "こんにちは" in japanese
// Should parse ISO-8859-1 charset
- s = "Content-Disposition: form-data; name=\"file\";
filename*=UTF-8\'\'%70%C3%A2%74%C3%A9\r\n";
+ s = "Content-Disposition: form-data; name=\"file\";
filename*=UTF-8''%70%C3%A2%74%C3%A9\r\n";
params = parser.parse(s, new char[] { ',', ';' });
assertEquals("\u0070\u00e2\u0074\u00e9", params.get("filename"));
//filename = "pâté" in french
// Should not decode if '*' is not at the end of param-name
- s = "Content-Disposition: form-data; name=\"file\";
file*name=UTF-8\'\'%61%62%63\r\n";
+ s = "Content-Disposition: form-data; name=\"file\";
file*name=UTF-8''%61%62%63\r\n";
params = parser.parse(s, new char[] {',', ';' });
- assertEquals("UTF-8\'\'%61%62%63", params.get("file*name"));
+ assertEquals("UTF-8''%61%62%63", params.get("file*name"));
// Should not decode if param-value does not follow
<charset>'<lang>'<encoded>
- s = "Content-Disposition: form-data; name=\"file\";
filename*=a\'bc\r\n";
+ s = "Content-Disposition: form-data; name=\"file\";
filename*=a'bc\r\n";
params = parser.parse(s, new char[] {',', ';' });
- assertEquals("a\'bc", params.get("filename"));
+ assertEquals("a'bc", params.get("filename"));
// Should not decode if param-name doesn't have '*' at end
- s = "Content-Disposition: form-data; name=\"file\";
filename=a\'b\'c\r\n";
+ s = "Content-Disposition: form-data; name=\"file\";
filename=a'b'c\r\n";
params = parser.parse(s, new char[] {',', ';' });
- assertEquals("a\'b\'c", params.get("filename"));
+ assertEquals("a'b'c", params.get("filename"));
}
}
diff --git
a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUploadTest.java
b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUploadTest.java
index f76c2db..f1efb16 100644
---
a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUploadTest.java
+++
b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUploadTest.java
@@ -32,7 +32,7 @@ import
org.apache.commons.fileupload2.disk.DiskFileItemFactory;
import org.junit.jupiter.api.Test;
/**
- * Test for {@link ServletFileUpload}.
+ * Test for {@link org.apache.commons.fileupload2.servlet.ServletFileUpload}.
*
* @see FileUploadTest
* @since 1.4
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 1838682..31ecaec 100644
---
a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
+++
b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
@@ -357,7 +357,7 @@ public class MockJakSrvltHttpRequest implements
HttpServletRequest {
*/
@Override
public ServletInputStream getInputStream() throws IOException {
- return (ServletInputStream) new MyServletInputStream(mRequestData,
readLimit);
+ return new MyServletInputStream(mRequestData, readLimit);
}
/**
@@ -586,7 +586,7 @@ public class MockJakSrvltHttpRequest implements
HttpServletRequest {
@Override
public long getContentLengthLong() {
- return (long) getContentLength();
+ return getContentLength();
}
@Override
diff --git
a/src/test/java/org/apache/commons/fileupload2/util/mime/RFC2231UtilityTestCase.java
b/src/test/java/org/apache/commons/fileupload2/util/mime/RFC2231UtilityTestCase.java
index 3af9bff..fbda22f 100644
---
a/src/test/java/org/apache/commons/fileupload2/util/mime/RFC2231UtilityTestCase.java
+++
b/src/test/java/org/apache/commons/fileupload2/util/mime/RFC2231UtilityTestCase.java
@@ -78,9 +78,7 @@ public final class RFC2231UtilityTestCase {
@Test
public void decodeInvalidEncoding() throws Exception {
- assertThrows(UnsupportedEncodingException.class, () -> {
- RFC2231Utility.decodeText("abc'en'hello");
- });
+ assertThrows(UnsupportedEncodingException.class, () ->
RFC2231Utility.decodeText("abc'en'hello"));
}
private static void assertEncoded(final String expected, final String
encoded) throws Exception {
