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 1251fc3b85ab8255244dd49f9d8ae894b7dc9645
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Sep 13 18:24:36 2023 -0400
Remove unused imports
Remove trailing whitespace
Add missing @Ovewrride
Use final
---
.../fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java | 3 ---
.../fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java | 2 --
.../fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java | 3 ---
.../fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java | 2 --
.../commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java | 2 --
.../apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java | 2 --
.../commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java | 3 ---
.../commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java | 3 ---
.../fileupload2/jakarta/servlet6/JakartaMockHttpServletRequest.java | 2 +-
.../fileupload2/jakarta/servlet6/JakartaMockServletHttpRequest.java | 2 ++
.../fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java | 3 ---
.../fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java | 2 --
.../fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java | 3 ---
.../fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java | 2 --
.../commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java | 2 --
.../apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java | 2 --
.../commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java | 3 ---
.../commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java | 3 ---
18 files changed, 3 insertions(+), 41 deletions(-)
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 ea57b4a7..c5e45fbc 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,9 +22,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
-
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 bfeb9964..20c4b944 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,8 +22,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
-
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 0d866abc..e149f37e 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
@@ -27,9 +27,6 @@ import org.apache.commons.fileupload2.core.Constants;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.FileUploadException;
-import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletRequestContext;
import org.junit.jupiter.api.Test;
import jakarta.servlet.http.HttpServletRequest;
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 deba4d55..06b8de62 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
@@ -27,8 +27,6 @@ import org.apache.commons.fileupload2.core.Constants;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.FileUploadException;
-import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletRequestContext;
import org.junit.jupiter.api.Test;
import jakarta.servlet.http.HttpServletRequest;
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 8761605f..0fbb4ccd 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,8 +21,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
-
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 3dc5c57a..2d5b7706 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,8 +21,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
-
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 6ba135e5..67358f3b 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,9 +21,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletRequestContext;
-
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 9c7493df..c6f42332 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,9 +21,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletRequestContext;
-
import jakarta.servlet.http.HttpServletRequest;
/**
diff --git
a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockHttpServletRequest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockHttpServletRequest.java
index 10e7229a..de7febbf 100644
---
a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockHttpServletRequest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockHttpServletRequest.java
@@ -545,7 +545,7 @@ public class JakartaMockHttpServletRequest implements
HttpServletRequest {
public boolean isAsyncSupported() {
return false;
}
-
+
/**
* @see HttpServletRequest#isRequestedSessionIdFromCookie()
*/
diff --git
a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockServletHttpRequest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockServletHttpRequest.java
index d8029b10..8268ceef 100644
---
a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockServletHttpRequest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockServletHttpRequest.java
@@ -374,6 +374,7 @@ public class JakartaMockServletHttpRequest implements
HttpServletRequest {
return null;
}
+ @Override
public String getProtocolRequestId() {
throw new IllegalStateException("Not implemented 6.0.0");
}
@@ -443,6 +444,7 @@ public class JakartaMockServletHttpRequest implements
HttpServletRequest {
return null;
}
+ @Override
public String getRequestId() {
throw new IllegalStateException("Not implemented 6.0.0");
}
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 4a7d5088..da577aff 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,9 +22,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
-
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 d3c1bf55..8a94afaf 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,8 +22,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
-
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 b9c7de10..f4713131 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
@@ -27,9 +27,6 @@ import org.apache.commons.fileupload2.core.Constants;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.FileUploadException;
-import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletRequestContext;
import org.junit.jupiter.api.Test;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java
index 6822ba87..c7105636 100644
---
a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java
@@ -27,8 +27,6 @@ import org.apache.commons.fileupload2.core.Constants;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.FileUploadException;
-import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletRequestContext;
import org.junit.jupiter.api.Test;
import jakarta.servlet.http.HttpServletRequest;
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 f24694d0..4ff90655 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,8 +21,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload;
-
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 df18b303..cddfe858 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,8 +21,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
-
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 dcfd57c0..f331e7be 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,9 +21,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletRequestContext;
-
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 74fde83a..c69e1456 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,9 +21,6 @@ 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
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
-import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletRequestContext;
-
import jakarta.servlet.http.HttpServletRequest;
/**
