You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by jo...@apache.org on 2021/04/22 20:56:10 UTC
[commons-fileupload] branch master updated: FILEUPLOAD-313 - Remove
redundant local variable
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 bc47cab FILEUPLOAD-313 - Remove redundant local variable
new 97df331 Merge pull request #61 from arturobernalg/feature/FILEUPLOAD-313
bc47cab is described below
commit bc47cab7e607dec3f966d192907ff9e74d4e2ed8
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Apr 22 20:12:27 2021 +0200
FILEUPLOAD-313 - Remove redundant local variable
---
src/main/java/org/apache/commons/fileupload2/FileUploadBase.java | 5 +----
.../java/org/apache/commons/fileupload2/MockHttpServletRequest.java | 3 +--
src/test/java/org/apache/commons/fileupload2/StreamingTest.java | 3 +--
src/test/java/org/apache/commons/fileupload2/Util.java | 3 +--
.../apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java | 3 +--
5 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
index ef93788..f0d6582 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
@@ -76,10 +76,7 @@ public abstract class FileUploadBase {
if (contentType == null) {
return false;
}
- if (contentType.toLowerCase(Locale.ENGLISH).startsWith(MULTIPART)) {
- return true;
- }
- return false;
+ return contentType.toLowerCase(Locale.ENGLISH).startsWith(MULTIPART);
}
/**
diff --git a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
index 71a4643..fee89dc 100644
--- a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
+++ b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
@@ -343,8 +343,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
*/
@Override
public ServletInputStream getInputStream() throws IOException {
- final ServletInputStream sis = new MyServletInputStream(m_requestData, readLimit);
- return sis;
+ return new MyServletInputStream(m_requestData, readLimit);
}
/**
diff --git a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
index cfe04a8..93934e4 100644
--- a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
@@ -182,8 +182,7 @@ public class StreamingTest {
final HttpServletRequest request = new MockHttpServletRequest(pStream,
pLength, contentType);
- final List<FileItem> fileItems = upload.parseRequest(new ServletRequestContext(request));
- return fileItems;
+ return upload.parseRequest(new ServletRequestContext(request));
}
private String getHeader(final String pField) {
diff --git a/src/test/java/org/apache/commons/fileupload2/Util.java b/src/test/java/org/apache/commons/fileupload2/Util.java
index d70938e..b644ce0 100644
--- a/src/test/java/org/apache/commons/fileupload2/Util.java
+++ b/src/test/java/org/apache/commons/fileupload2/Util.java
@@ -40,8 +40,7 @@ public class Util {
public static List<FileItem> parseUpload(final FileUpload upload, final byte[] bytes, final String contentType) throws FileUploadException {
final HttpServletRequest request = new MockHttpServletRequest(bytes, contentType);
- final List<FileItem> fileItems = upload.parseRequest(new ServletRequestContext(request));
- return fileItems;
+ return upload.parseRequest(new ServletRequestContext(request));
}
public static List<FileItem> parseUpload(final FileUpload upload, final String content)
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 b863c5b..7df23a4 100644
--- a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
+++ b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
@@ -357,8 +357,7 @@ public class MockJakSrvltHttpRequest implements HttpServletRequest {
*/
@Override
public ServletInputStream getInputStream() throws IOException {
- final ServletInputStream sis = new MyServletInputStream(m_requestData, readLimit);
- return sis;
+ return (ServletInputStream) new MyServletInputStream(m_requestData, readLimit);
}
/**