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 2019/12/26 01:51:37 UTC
[commons-fileupload] branch master updated: Use
Objects.requireNonNull() instead of custom check. Minor formatting.
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 e8124ca Use Objects.requireNonNull() instead of custom check. Minor formatting.
e8124ca is described below
commit e8124cae7e107afe3ff468bb66d968e462ad108d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Dec 25 20:51:33 2019 -0500
Use Objects.requireNonNull() instead of custom check. Minor formatting.
---
.../org/apache/commons/fileupload2/FileUploadBase.java | 8 +++-----
.../commons/fileupload2/impl/FileItemIteratorImpl.java | 16 ++++++----------
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
index ca3c85a..76a53ce 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
@@ -329,16 +330,13 @@ public abstract class FileUploadBase {
boolean successful = false;
try {
FileItemIterator iter = getItemIterator(ctx);
- FileItemFactory fac = getFileItemFactory();
+ FileItemFactory fileItemFactory = Objects.requireNonNull(getFileItemFactory(), "No FileItemFactory has been set.");
final byte[] buffer = new byte[Streams.DEFAULT_BUFFER_SIZE];
- if (fac == null) {
- throw new NullPointerException("No FileItemFactory has been set.");
- }
while (iter.hasNext()) {
final FileItemStream item = iter.next();
// Don't use getName() here to prevent an InvalidFileNameException.
final String fileName = ((FileItemStreamImpl) item).getName();
- FileItem fileItem = fac.createItem(item.getFieldName(), item.getContentType(),
+ FileItem fileItem = fileItemFactory.createItem(item.getFieldName(), item.getContentType(),
item.isFormField(), fileName);
items.add(fileItem);
try {
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 db64ade..f774099 100644
--- a/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
+++ b/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.NoSuchElementException;
+import java.util.Objects;
import org.apache.commons.fileupload2.FileItem;
import org.apache.commons.fileupload2.FileItemHeaders;
@@ -119,16 +120,11 @@ public class FileItemIteratorImpl implements FileItemIterator {
* @throws IOException An I/O error occurred.
*/
public FileItemIteratorImpl(FileUploadBase fileUploadBase, RequestContext requestContext)
- throws FileUploadException, IOException {
- this.fileUploadBase = fileUploadBase;
- sizeMax = fileUploadBase.getSizeMax();
- fileSizeMax = fileUploadBase.getFileSizeMax();
- ctx = requestContext;
- if (ctx == null) {
- throw new NullPointerException("ctx parameter");
- }
-
-
+ throws FileUploadException, IOException {
+ this.fileUploadBase = fileUploadBase;
+ sizeMax = fileUploadBase.getSizeMax();
+ fileSizeMax = fileUploadBase.getFileSizeMax();
+ ctx = Objects.requireNonNull(requestContext, "requestContext");
skipPreamble = true;
findNextItem();
}