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/04/02 15:47:11 UTC
[commons-fileupload] 06/08: Organize 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 86a7e59ddbc1f37e0c182b0e4d49dc8f3ef775fa
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Apr 2 11:39:42 2023 -0400
Organize imports
---
src/main/java/org/apache/commons/fileupload2/RequestContext.java | 2 +-
.../org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java | 2 +-
.../org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java | 4 ++--
.../apache/commons/fileupload2/jaksrvlt/JakSrvltRequestContext.java | 4 ++--
.../org/apache/commons/fileupload2/servlet/FileCleanerCleanup.java | 2 +-
src/test/java/org/apache/commons/fileupload2/SizesTest.java | 2 +-
.../apache/commons/fileupload2/jaksrvlt/JakSrvltFileUploadTest.java | 4 ++--
.../apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java | 1 -
.../commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java | 2 +-
9 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/commons/fileupload2/RequestContext.java b/src/main/java/org/apache/commons/fileupload2/RequestContext.java
index 8a0e501..fa7bed1 100644
--- a/src/main/java/org/apache/commons/fileupload2/RequestContext.java
+++ b/src/main/java/org/apache/commons/fileupload2/RequestContext.java
@@ -16,8 +16,8 @@
*/
package org.apache.commons.fileupload2;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
/**
* <p>Abstracts access to the request information needed for file uploads. This
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 9bb2e57..4976387 100644
--- a/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
+++ b/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
@@ -36,8 +36,8 @@ import org.apache.commons.fileupload2.MultipartStream;
import org.apache.commons.fileupload2.ProgressListener;
import org.apache.commons.fileupload2.RequestContext;
import org.apache.commons.fileupload2.UploadContext;
-import org.apache.commons.fileupload2.pub.FileUploadSizeException;
import org.apache.commons.fileupload2.pub.FileUploadContentTypeException;
+import org.apache.commons.fileupload2.pub.FileUploadSizeException;
import org.apache.commons.fileupload2.util.LimitedInputStream;
import org.apache.commons.io.IOUtils;
diff --git a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java
index 48689c5..088918d 100644
--- a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java
+++ b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUpload.java
@@ -20,8 +20,6 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
-import jakarta.servlet.http.HttpServletRequest;
-
import org.apache.commons.fileupload2.FileItem;
import org.apache.commons.fileupload2.FileItemFactory;
import org.apache.commons.fileupload2.FileItemIterator;
@@ -29,6 +27,8 @@ import org.apache.commons.fileupload2.FileUpload;
import org.apache.commons.fileupload2.FileUploadBase;
import org.apache.commons.fileupload2.FileUploadException;
+import jakarta.servlet.http.HttpServletRequest;
+
/**
* <p>High level API for processing file uploads.</p>
*
diff --git a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltRequestContext.java b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltRequestContext.java
index 4a84fc9..cb40ab7 100644
--- a/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltRequestContext.java
+++ b/src/main/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltRequestContext.java
@@ -21,11 +21,11 @@ import static java.lang.String.format;
import java.io.IOException;
import java.io.InputStream;
-import jakarta.servlet.http.HttpServletRequest;
-
import org.apache.commons.fileupload2.FileUploadBase;
import org.apache.commons.fileupload2.UploadContext;
+import jakarta.servlet.http.HttpServletRequest;
+
/**
* <p>Provides access to the request information needed for a request made to
* an HTTP servlet.</p>
diff --git a/src/main/java/org/apache/commons/fileupload2/servlet/FileCleanerCleanup.java b/src/main/java/org/apache/commons/fileupload2/servlet/FileCleanerCleanup.java
index 3854226..f429b2d 100644
--- a/src/main/java/org/apache/commons/fileupload2/servlet/FileCleanerCleanup.java
+++ b/src/main/java/org/apache/commons/fileupload2/servlet/FileCleanerCleanup.java
@@ -17,8 +17,8 @@
package org.apache.commons.fileupload2.servlet;
import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
import org.apache.commons.io.FileCleaningTracker;
diff --git a/src/test/java/org/apache/commons/fileupload2/SizesTest.java b/src/test/java/org/apache/commons/fileupload2/SizesTest.java
index 574f35c..398b87d 100644
--- a/src/test/java/org/apache/commons/fileupload2/SizesTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/SizesTest.java
@@ -31,8 +31,8 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.fileupload2.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload2.pub.FileUploadSizeException;
import org.apache.commons.fileupload2.pub.FileUploadByteCountLimitException;
+import org.apache.commons.fileupload2.pub.FileUploadSizeException;
import org.apache.commons.fileupload2.servlet.ServletFileUpload;
import org.apache.commons.fileupload2.util.Streams;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUploadTest.java b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUploadTest.java
index db0eb55..0fe2339 100644
--- a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUploadTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/JakSrvltFileUploadTest.java
@@ -23,14 +23,14 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
-import jakarta.servlet.http.HttpServletRequest;
-
import org.apache.commons.fileupload2.Constants;
import org.apache.commons.fileupload2.FileItem;
import org.apache.commons.fileupload2.FileUploadTest;
import org.apache.commons.fileupload2.disk.DiskFileItemFactory;
import org.junit.jupiter.api.Test;
+import jakarta.servlet.http.HttpServletRequest;
+
/**
* Test for {@link org.apache.commons.fileupload2.servlet.ServletFileUpload}.
*
diff --git a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
index fe4e230..f8a5982 100644
--- a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
+++ b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
@@ -27,7 +27,6 @@ import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
-
import org.apache.commons.fileupload2.FileUploadBase;
import jakarta.servlet.AsyncContext;
diff --git a/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java b/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java
index 8e4df90..f685a06 100644
--- a/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java
+++ b/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java
@@ -18,8 +18,8 @@ package org.apache.commons.fileupload2.util.mime;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.IOException;