(commons-fileupload) branch 1.x updated: Use Objects.requiteNonNull()

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git


The following commit(s) were added to refs/heads/1.x by this push:
     new ce6d687d Use Objects.requiteNonNull()
ce6d687d is described below

commit ce6d687d85efacdab400c829c1c26d44f6794f1e
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Apr 19 09:04:08 2025 -0400

    Use Objects.requiteNonNull()
---
 .../org/apache/commons/fileupload/FileUploadBase.java     | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/apache/commons/fileupload/FileUploadBase.java 
b/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
index 7097a36a..118b6d6d 100644
--- a/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
+++ b/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
@@ -1385,16 +1385,13 @@ public abstract class FileUploadBase {
      * @throws FileUploadException if there are problems reading/parsing
      *                             the request or storing files.
      */
-    public List<FileItem> parseRequest(final RequestContext ctx)
-            throws FileUploadException {
+    public List<FileItem> parseRequest(final RequestContext ctx) throws 
FileUploadException {
         final List<FileItem> items = new ArrayList<>();
         boolean successful = false;
         try {
             final FileItemIterator iter = getItemIterator(ctx);
-            final FileItemFactory fac = getFileItemFactory();
-            if (fac == null) {
-                throw new NullPointerException("No FileItemFactory has been 
set.");
-            }
+            final FileItemFactory fileItemFactory = getFileItemFactory();
+            Objects.requireNonNull(fileItemFactory, "getFileItemFactory()");
             final byte[] buffer = new byte[Streams.DEFAULT_BUFFER_SIZE];
             while (iter.hasNext()) {
                 if (items.size() == fileCountMax) {
@@ -1404,16 +1401,14 @@ public abstract class FileUploadBase {
                 final FileItemStream item = iter.next();
                 // Don't use getName() here to prevent an 
InvalidFileNameException.
                 final String fileName = 
((FileItemIteratorImpl.FileItemStreamImpl) item).name;
-                final FileItem fileItem = fac.createItem(item.getFieldName(), 
item.getContentType(),
-                                                   item.isFormField(), 
fileName);
+                final FileItem fileItem = 
fileItemFactory.createItem(item.getFieldName(), item.getContentType(), 
item.isFormField(), fileName);
                 items.add(fileItem);
                 try {
                     Streams.copy(item.openStream(), 
fileItem.getOutputStream(), true, buffer);
                 } catch (final FileUploadIOException e) {
                     throw (FileUploadException) e.getCause();
                 } catch (final IOException e) {
-                    throw new IOFileUploadException(format("Processing of %s 
request failed. %s",
-                                                           
MULTIPART_FORM_DATA, e.getMessage()), e);
+                    throw new IOFileUploadException(format("Processing of %s 
request failed. %s", MULTIPART_FORM_DATA, e.getMessage()), e);
                 }
                 final FileItemHeaders fih = item.getHeaders();
                 fileItem.setHeaders(fih);