Use Objects.requireNonNull() instead of custom check. Minor formatting.
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.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
@@ -329,16 +330,13 @@
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.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 @@
* @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();
}
