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 2023/12/24 16:14:49 UTC
(commons-fileupload) 01/02: Clean up imports
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
commit 12890c5e7b61d50279dc5e5f3c028559cb71b64a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Dec 24 11:08:04 2023 -0500
Clean up imports
Format tweaks
---
.../java/org/apache/commons/fileupload2/core/DiskFileItemFactory.java | 1 +
.../org/apache/commons/fileupload2/jakarta/servlet5/package-info.java | 2 +-
.../fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java | 1 +
.../fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java | 1 +
.../fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java | 3 ++-
.../fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java | 2 +-
.../commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java | 1 +
.../apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java | 1 +
.../commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java | 1 +
.../commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java | 1 +
.../org/apache/commons/fileupload2/jakarta/servlet6/package-info.java | 2 +-
.../fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java | 1 +
.../fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java | 1 +
.../fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java | 3 ++-
.../commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java | 1 +
.../apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java | 1 +
.../commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java | 1 +
.../commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java | 1 +
18 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/DiskFileItemFactory.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/DiskFileItemFactory.java
index ecfdf853..166a0fa8 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/DiskFileItemFactory.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/DiskFileItemFactory.java
@@ -62,6 +62,7 @@ public final class DiskFileItemFactory implements FileItemFactory<DiskFileItem>
* <p>
* For example:
* </p>
+ *
* <pre>{@code
* DiskFileItemFactory factory = DiskFileItemFactory.builder().setPath(path).setBufferSize(DEFAULT_THRESHOLD).get();
* }
diff --git a/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/package-info.java b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/package-info.java
index 83f86332..8d3895dc 100644
--- a/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/package-info.java
+++ b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/package-info.java
@@ -27,7 +27,7 @@
* <pre>{@code
* DiskFileItemFactory factory = DiskFileItemFactory().builder().get();
* // Configure the factory here, if desired.
- * JakartaServletFileUpload upload = new JakartaServletFileUpload (factory);
+ * JakartaServletFileUpload upload = new JakartaServletFileUpload(factory);
* // Configure the uploader here, if desired.
* List fileItems = upload.parseRequest(request);
* }</pre>
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java
index c5e45fbc..9b703a58 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java
@@ -22,6 +22,7 @@ import org.apache.commons.fileupload2.core.AbstractProgressListenerTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.ProgressListener;
+
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java
index 20c4b944..c8908852 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java
@@ -22,6 +22,7 @@ import org.apache.commons.fileupload2.core.AbstractProgressListenerTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.ProgressListener;
+
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java
index 5b67cc5b..5c3562d7 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java
@@ -36,7 +36,8 @@ import jakarta.servlet.http.HttpServletRequest;
*
* @see AbstractFileUploadTest
*/
-public class JakartaServletFileUploadDiskTest extends AbstractFileUploadTest<JakartaServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
+public class JakartaServletFileUploadDiskTest
+ extends AbstractFileUploadTest<JakartaServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
public JakartaServletFileUploadDiskTest() {
super(new JakartaServletDiskFileUpload());
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java
index 71c5f8b1..cd0baa58 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java
@@ -118,7 +118,7 @@ public class JakartaServletFileUploadTest
final var itemCount = new AtomicInteger();
// Replace iterator with this one to make test passed
- JakartaMockServletHttpRequest request2 = new JakartaMockServletHttpRequest(bytes, Constants.CONTENT_TYPE);
+ final var request2 = new JakartaMockServletHttpRequest(bytes, Constants.CONTENT_TYPE);
upload.parseParameterMap(request);
upload.getItemIterator(request2).forEachRemaining(item -> itemCount.incrementAndGet());
upload.getItemIterator(request).forEachRemaining(item -> itemCount.incrementAndGet());
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java
index 0fbb4ccd..4d4f105c 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractSizesTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java
index 2d5b7706..f1078198 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractSizesTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java
index 67358f3b..f9a15016 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractStreamingTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java
index c6f42332..8e85a891 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractStreamingTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/package-info.java b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/package-info.java
index a7ef77e8..9a25b7e8 100644
--- a/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/package-info.java
+++ b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/package-info.java
@@ -27,7 +27,7 @@
* <pre>{@code
* DiskFileItemFactory factory = DiskFileItemFactory().builder().get();
* // Configure the factory here, if desired.
- * JakartaServletFileUpload upload = new JakartaServletFileUpload (factory);
+ * JakartaServletFileUpload upload = new JakartaServletFileUpload(factory);
* // Configure the uploader here, if desired.
* List fileItems = upload.parseRequest(request);
* }</pre>
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java
index da577aff..56203c55 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java
@@ -22,6 +22,7 @@ import org.apache.commons.fileupload2.core.AbstractProgressListenerTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.ProgressListener;
+
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java
index 8a94afaf..8347792b 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java
@@ -22,6 +22,7 @@ import org.apache.commons.fileupload2.core.AbstractProgressListenerTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.ProgressListener;
+
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java
index 0b2f4898..3139c671 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java
@@ -36,7 +36,8 @@ import jakarta.servlet.http.HttpServletRequest;
*
* @see AbstractFileUploadTest
*/
-public class JakartaServletFileUploadDiskTest extends AbstractFileUploadTest<JakartaServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
+public class JakartaServletFileUploadDiskTest
+ extends AbstractFileUploadTest<JakartaServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
public JakartaServletFileUploadDiskTest() {
super(new JakartaServletDiskFileUpload());
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java
index 4ff90655..ded1407b 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractSizesTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java
index cddfe858..4aa6ed8a 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractSizesTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java
index f331e7be..576aff5e 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractStreamingTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java
index c69e1456..c141e457 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractStreamingTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+
import jakarta.servlet.http.HttpServletRequest;
/**