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/06/06 00:59:10 UTC
[commons-fileupload] branch master updated (aed1ff8 -> 0966717)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
from aed1ff8 Drop @since Javadoc tags for 2.0
new 9fa94a5 No benefit in packaging exceptions classes separately
new 9df5176 Hide FileItemIterator implementation details
new e697ffc Hide FileItemHeaders implementation details
new f84da16 Rename package
new 43bc3ce Migrate from deprecated API
new 9b9366b Remove unused exception from signature
new 2f5ffd3 Clean up imports
new 0966717 Migrate from deprecated API
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/fileupload2/AbstractFileUpload.java | 3 ---
.../{util => }/FileItemHeadersImpl.java | 6 ++----
.../commons/fileupload2/FileItemIterator.java | 2 --
.../{impl => }/FileItemIteratorImpl.java | 17 +++--------------
.../fileupload2/{impl => }/FileItemStreamImpl.java | 11 +++--------
.../FileUploadByteCountLimitException.java | 2 +-
.../{pub => }/FileUploadContentTypeException.java | 4 +---
.../FileUploadFileCountLimitException.java | 2 +-
.../{pub => }/FileUploadSizeException.java | 4 +---
.../commons/fileupload2/MultipartStream.java | 3 +--
.../commons/fileupload2/ParameterParser.java | 4 ++--
.../commons/fileupload2/disk/DiskFileItem.java | 3 +--
.../commons/fileupload2/impl/package-info.java | 21 ---------------------
.../fileupload2/{util => }/mime/MimeUtility.java | 2 +-
.../{util => }/mime/ParseException.java | 2 +-
.../{util => }/mime/QuotedPrintableDecoder.java | 2 +-
.../{util => }/mime/RFC2231Utility.java | 2 +-
.../fileupload2/{util => }/mime/package-info.java | 2 +-
.../commons/fileupload2/pub/package-info.java | 21 ---------------------
.../commons/fileupload2/util/package-info.java | 22 ----------------------
.../commons/fileupload2/AbstractSizesTest.java | 2 --
.../fileupload2/DiskFileItemSerializeTest.java | 2 +-
.../commons/fileupload2/FileItemHeadersTest.java | 1 -
.../{util => }/mime/MimeUtilityTestCase.java | 2 +-
.../mime/QuotedPrintableDecoderTestCase.java | 2 +-
.../{util => }/mime/RFC2231UtilityTestCase.java | 2 +-
src/site/apt/migration.apt.vm | 3 +--
27 files changed, 26 insertions(+), 123 deletions(-)
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{util => }/FileItemHeadersImpl.java (94%)
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{impl => }/FileItemIteratorImpl.java (93%)
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{impl => }/FileItemStreamImpl.java (91%)
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{pub => }/FileUploadByteCountLimitException.java (98%)
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{pub => }/FileUploadContentTypeException.java (95%)
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{pub => }/FileUploadFileCountLimitException.java (97%)
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{pub => }/FileUploadSizeException.java (95%)
delete mode 100644 commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/package-info.java
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{util => }/mime/MimeUtility.java (99%)
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{util => }/mime/ParseException.java (95%)
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{util => }/mime/QuotedPrintableDecoder.java (98%)
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{util => }/mime/RFC2231Utility.java (99%)
rename commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/{util => }/mime/package-info.java (95%)
delete mode 100644 commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/package-info.java
delete mode 100644 commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/package-info.java
rename commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/{util => }/mime/MimeUtilityTestCase.java (98%)
rename commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/{util => }/mime/QuotedPrintableDecoderTestCase.java (98%)
rename commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/{util => }/mime/RFC2231UtilityTestCase.java (98%)
[commons-fileupload] 02/08: Hide FileItemIterator implementation details
Posted by gg...@apache.org.
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 9df5176e9a44d2cca5ab0767ca8780a0cdf2a1c5
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 20:39:44 2023 -0400
Hide FileItemIterator implementation details
---
.../commons/fileupload2/AbstractFileUpload.java | 1 -
.../{impl => }/FileItemIteratorImpl.java | 17 +++--------------
.../fileupload2/{impl => }/FileItemStreamImpl.java | 11 +++--------
.../commons/fileupload2/impl/package-info.java | 21 ---------------------
4 files changed, 6 insertions(+), 44 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
index 3d0df9b..81542b5 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
@@ -27,7 +27,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Objects;
-import org.apache.commons.fileupload2.impl.FileItemIteratorImpl;
import org.apache.commons.fileupload2.util.FileItemHeadersImpl;
import org.apache.commons.io.IOUtils;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemIteratorImpl.java
similarity index 93%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemIteratorImpl.java
index 43b2ef4..c067080 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemIteratorImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.impl;
+package org.apache.commons.fileupload2;
import java.io.IOException;
import java.io.InputStream;
@@ -24,24 +24,13 @@ import java.util.Locale;
import java.util.NoSuchElementException;
import java.util.Objects;
-import org.apache.commons.fileupload2.AbstractFileUpload;
-import org.apache.commons.fileupload2.FileItem;
-import org.apache.commons.fileupload2.FileItemHeaders;
-import org.apache.commons.fileupload2.FileItemIterator;
-import org.apache.commons.fileupload2.FileItemStream;
-import org.apache.commons.fileupload2.FileUploadContentTypeException;
-import org.apache.commons.fileupload2.FileUploadException;
-import org.apache.commons.fileupload2.FileUploadSizeException;
-import org.apache.commons.fileupload2.MultipartStream;
-import org.apache.commons.fileupload2.ProgressListener;
-import org.apache.commons.fileupload2.RequestContext;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.BoundedInputStream;
/**
* The iterator, which is returned by {@link AbstractFileUpload#getItemIterator(RequestContext)}.
*/
-public class FileItemIteratorImpl implements FileItemIterator {
+class FileItemIteratorImpl implements FileItemIterator {
/**
* The file uploads processing utility.
@@ -115,7 +104,7 @@ public class FileItemIteratorImpl implements FileItemIterator {
* @throws FileUploadException An error occurred while parsing the request.
* @throws IOException An I/O error occurred.
*/
- public FileItemIteratorImpl(final AbstractFileUpload fileUploadBase, final RequestContext requestContext) throws FileUploadException, IOException {
+ FileItemIteratorImpl(final AbstractFileUpload fileUploadBase, final RequestContext requestContext) throws FileUploadException, IOException {
this.fileUploadBase = fileUploadBase;
this.sizeMax = fileUploadBase.getSizeMax();
this.fileSizeMax = fileUploadBase.getFileSizeMax();
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemStreamImpl.java
similarity index 91%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemStreamImpl.java
index 815ccb8..4ef7e47 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemStreamImpl.java
@@ -14,16 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.impl;
+package org.apache.commons.fileupload2;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.commons.fileupload2.FileItemHeaders;
-import org.apache.commons.fileupload2.FileItemStream;
-import org.apache.commons.fileupload2.FileUploadByteCountLimitException;
-import org.apache.commons.fileupload2.FileUploadException;
-import org.apache.commons.fileupload2.InvalidFileNameException;
import org.apache.commons.fileupload2.MultipartStream.ItemInputStream;
import org.apache.commons.fileupload2.disk.DiskFileItem;
import org.apache.commons.io.input.BoundedInputStream;
@@ -31,7 +26,7 @@ import org.apache.commons.io.input.BoundedInputStream;
/**
* Default implementation of {@link FileItemStream}.
*/
-public class FileItemStreamImpl implements FileItemStream {
+class FileItemStreamImpl implements FileItemStream {
/**
* The File Item iterator implementation.
@@ -87,7 +82,7 @@ public class FileItemStreamImpl implements FileItemStream {
* @throws IOException Creating the file item failed.
* @throws FileUploadException Parsing the incoming data stream failed.
*/
- public FileItemStreamImpl(final FileItemIteratorImpl fileItemIterator, final String fileName, final String fieldName, final String contentType,
+ FileItemStreamImpl(final FileItemIteratorImpl fileItemIterator, final String fileName, final String fieldName, final String contentType,
final boolean formField, final long contentLength) throws FileUploadException, IOException {
this.fileItemIteratorImpl = fileItemIterator;
this.fileName = fileName;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/package-info.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/package-info.java
deleted file mode 100644
index 93c87ac..0000000
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Implementations and exceptions utils.
- */
-package org.apache.commons.fileupload2.impl;
[commons-fileupload] 04/08: Rename package
Posted by gg...@apache.org.
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 f84da16635405d81bbd2514b191aca6ea5e556c0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 20:47:46 2023 -0400
Rename package
---
.../commons/fileupload2/ParameterParser.java | 4 ++--
.../fileupload2/{util => }/mime/MimeUtility.java | 2 +-
.../{util => }/mime/ParseException.java | 2 +-
.../{util => }/mime/QuotedPrintableDecoder.java | 2 +-
.../{util => }/mime/RFC2231Utility.java | 2 +-
.../fileupload2/{util => }/mime/package-info.java | 2 +-
.../commons/fileupload2/util/package-info.java | 22 ----------------------
.../{util => }/mime/MimeUtilityTestCase.java | 3 ++-
.../mime/QuotedPrintableDecoderTestCase.java | 3 ++-
.../{util => }/mime/RFC2231UtilityTestCase.java | 3 ++-
10 files changed, 13 insertions(+), 32 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
index 9a266b1..e1a80ca 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
@@ -21,8 +21,8 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.fileupload2.util.mime.MimeUtility;
-import org.apache.commons.fileupload2.util.mime.RFC2231Utility;
+import org.apache.commons.fileupload2.mime.MimeUtility;
+import org.apache.commons.fileupload2.mime.RFC2231Utility;
/**
* A simple parser intended to parse sequences of name/value pairs.
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/MimeUtility.java
similarity index 99%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/MimeUtility.java
index 18fd9d8..2d7c3ab 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/MimeUtility.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/ParseException.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/ParseException.java
similarity index 95%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/ParseException.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/ParseException.java
index 6ea1efc..d8e3aa1 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/ParseException.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/ParseException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
/**
*/
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoder.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoder.java
similarity index 98%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoder.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoder.java
index 9ca256f..2335fe5 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoder.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/RFC2231Utility.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/RFC2231Utility.java
similarity index 99%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/RFC2231Utility.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/RFC2231Utility.java
index e94d007..9289fba 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/RFC2231Utility.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/RFC2231Utility.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/package-info.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/package-info.java
similarity index 95%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/package-info.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/package-info.java
index 8fffd8e..ca9c417 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/package-info.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/package-info.java
@@ -19,4 +19,4 @@
* MIME decoder implementation, imported and retailed from <a href="http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javamail_1.4_spec-1.4/">Apache
* Geronimo</a>.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/package-info.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/package-info.java
deleted file mode 100644
index b988928..0000000
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This package contains various IO related utility classes or methods, which are basically reusable and not necessarily restricted to the scope of a file
- * upload.
- */
-package org.apache.commons.fileupload2.util;
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/MimeUtilityTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/MimeUtilityTestCase.java
similarity index 96%
rename from commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/MimeUtilityTestCase.java
rename to commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/MimeUtilityTestCase.java
index b20ca36..d23bda0 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/MimeUtilityTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/MimeUtilityTestCase.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.UnsupportedEncodingException;
+import org.apache.commons.fileupload2.mime.MimeUtility;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoderTestCase.java
similarity index 97%
rename from commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java
rename to commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoderTestCase.java
index 7ff7014..2c1ac33 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoderTestCase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -25,6 +25,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import org.apache.commons.fileupload2.mime.QuotedPrintableDecoder;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/RFC2231UtilityTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/RFC2231UtilityTestCase.java
similarity index 97%
rename from commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/RFC2231UtilityTestCase.java
rename to commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/RFC2231UtilityTestCase.java
index bc999cc..5933ab1 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/RFC2231UtilityTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/RFC2231UtilityTestCase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.UnsupportedEncodingException;
+import org.apache.commons.fileupload2.mime.RFC2231Utility;
import org.junit.jupiter.api.Test;
/**
[commons-fileupload] 05/08: Migrate from deprecated API
Posted by gg...@apache.org.
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 43bc3cec8ec263717400a8f480c1501133501b3e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 20:52:46 2023 -0400
Migrate from deprecated API
---
.../src/main/java/org/apache/commons/fileupload2/MultipartStream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
index e3ef569..974e717 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
@@ -644,7 +644,7 @@ public class MultipartStream {
* @throws IOException if an i/o error occurs.
*/
public long discardBodyData() throws MalformedStreamException, IOException {
- return readBodyData(NullOutputStream.NULL_OUTPUT_STREAM);
+ return readBodyData(NullOutputStream.INSTANCE);
}
/**
[commons-fileupload] 07/08: Clean up imports
Posted by gg...@apache.org.
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 2f5ffd39a925e845e5497cd9f31f38d9fec8e1e0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 20:53:40 2023 -0400
Clean up imports
---
.../java/org/apache/commons/fileupload2/mime/MimeUtilityTestCase.java | 1 -
.../apache/commons/fileupload2/mime/QuotedPrintableDecoderTestCase.java | 1 -
.../java/org/apache/commons/fileupload2/mime/RFC2231UtilityTestCase.java | 1 -
3 files changed, 3 deletions(-)
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/MimeUtilityTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/MimeUtilityTestCase.java
index d23bda0..46c61cb 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/MimeUtilityTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/MimeUtilityTestCase.java
@@ -21,7 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.UnsupportedEncodingException;
-import org.apache.commons.fileupload2.mime.MimeUtility;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoderTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoderTestCase.java
index 2c1ac33..43fb76c 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoderTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoderTestCase.java
@@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import org.apache.commons.fileupload2.mime.QuotedPrintableDecoder;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/RFC2231UtilityTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/RFC2231UtilityTestCase.java
index 5933ab1..459c982 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/RFC2231UtilityTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/RFC2231UtilityTestCase.java
@@ -23,7 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.UnsupportedEncodingException;
-import org.apache.commons.fileupload2.mime.RFC2231Utility;
import org.junit.jupiter.api.Test;
/**
[commons-fileupload] 06/08: Remove unused exception from signature
Posted by gg...@apache.org.
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 9b9366bb68f72fa1d117c18ff96baeb743a8a78e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 20:53:22 2023 -0400
Remove unused exception from signature
---
.../java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java
index 244a18a..dad40e7 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java
@@ -203,7 +203,7 @@ public class DiskFileItemSerializeTest {
* Fails when repository contains a null character.
*/
@Test
- public void testInvalidRepositoryWithNullChar() throws IOException {
+ public void testInvalidRepositoryWithNullChar() {
// Create the FileItem
final byte[] testFieldValueBytes = createContentBytes(THRESHOLD);
final File repository = new File(FileUtils.getTempDirectory(), "\0");
[commons-fileupload] 08/08: Migrate from deprecated API
Posted by gg...@apache.org.
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 0966717a604945089d727bcab0cf425c98763381
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 20:59:05 2023 -0400
Migrate from deprecated API
---
.../main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
index 8a21c53..b904e23 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
@@ -327,8 +327,7 @@ public class DiskFileItem implements FileItem {
@Override
public OutputStream getOutputStream() {
if (dfos == null) {
- final File outputFile = getTempFile();
- dfos = new DeferredFileOutputStream(sizeThreshold, outputFile);
+ dfos = DeferredFileOutputStream.builder().setThreshold(sizeThreshold).setOutputFile(getTempFile()).get();
}
return dfos;
}
[commons-fileupload] 01/08: No benefit in packaging exceptions classes separately
Posted by gg...@apache.org.
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 9fa94a5d31806ae31cb60e8d572706437315d1b6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 20:36:04 2023 -0400
No benefit in packaging exceptions classes separately
---
.../commons/fileupload2/AbstractFileUpload.java | 1 -
.../commons/fileupload2/FileItemIterator.java | 2 --
.../FileUploadByteCountLimitException.java | 2 +-
.../{pub => }/FileUploadContentTypeException.java | 4 +---
.../FileUploadFileCountLimitException.java | 2 +-
.../{pub => }/FileUploadSizeException.java | 4 +---
.../apache/commons/fileupload2/MultipartStream.java | 1 -
.../fileupload2/impl/FileItemIteratorImpl.java | 4 ++--
.../fileupload2/impl/FileItemStreamImpl.java | 2 +-
.../commons/fileupload2/pub/package-info.java | 21 ---------------------
.../commons/fileupload2/AbstractSizesTest.java | 2 --
src/site/apt/migration.apt.vm | 3 +--
12 files changed, 8 insertions(+), 40 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
index 65974e7..3d0df9b 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
@@ -28,7 +28,6 @@ import java.util.Map;
import java.util.Objects;
import org.apache.commons.fileupload2.impl.FileItemIteratorImpl;
-import org.apache.commons.fileupload2.pub.FileUploadFileCountLimitException;
import org.apache.commons.fileupload2.util.FileItemHeadersImpl;
import org.apache.commons.io.IOUtils;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
index d8338fd..19c8337 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
@@ -21,8 +21,6 @@ import java.util.List;
import javax.naming.SizeLimitExceededException;
-import org.apache.commons.fileupload2.pub.FileUploadByteCountLimitException;
-
/**
* An iterator, as returned by {@link AbstractFileUpload#getItemIterator(RequestContext)}.
*/
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadByteCountLimitException.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadByteCountLimitException.java
similarity index 98%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadByteCountLimitException.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadByteCountLimitException.java
index 612f1b2..5d99f54 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadByteCountLimitException.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadByteCountLimitException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.pub;
+package org.apache.commons.fileupload2;
/**
* Signals that a file size exceeds the configured maximum.
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadContentTypeException.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadContentTypeException.java
similarity index 95%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadContentTypeException.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadContentTypeException.java
index 2d0f18d..ea7205c 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadContentTypeException.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadContentTypeException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.pub;
-
-import org.apache.commons.fileupload2.FileUploadException;
+package org.apache.commons.fileupload2;
/**
* Signals that a request is not a multipart request.
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadFileCountLimitException.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadFileCountLimitException.java
similarity index 97%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadFileCountLimitException.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadFileCountLimitException.java
index 666a92b..a5138c1 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadFileCountLimitException.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadFileCountLimitException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.pub;
+package org.apache.commons.fileupload2;
/**
* Signals that a request contains more files than the specified limit.
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadSizeException.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadSizeException.java
similarity index 95%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadSizeException.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadSizeException.java
index 9efa8b7..8d52e65 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/FileUploadSizeException.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUploadSizeException.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.pub;
-
-import org.apache.commons.fileupload2.FileUploadException;
+package org.apache.commons.fileupload2;
/**
* Signals that a requests permitted size is exceeded.
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
index 5a3a37b..e3ef569 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-import org.apache.commons.fileupload2.pub.FileUploadSizeException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.NullOutputStream;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
index e703e44..43b2ef4 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
@@ -29,12 +29,12 @@ import org.apache.commons.fileupload2.FileItem;
import org.apache.commons.fileupload2.FileItemHeaders;
import org.apache.commons.fileupload2.FileItemIterator;
import org.apache.commons.fileupload2.FileItemStream;
+import org.apache.commons.fileupload2.FileUploadContentTypeException;
import org.apache.commons.fileupload2.FileUploadException;
+import org.apache.commons.fileupload2.FileUploadSizeException;
import org.apache.commons.fileupload2.MultipartStream;
import org.apache.commons.fileupload2.ProgressListener;
import org.apache.commons.fileupload2.RequestContext;
-import org.apache.commons.fileupload2.pub.FileUploadContentTypeException;
-import org.apache.commons.fileupload2.pub.FileUploadSizeException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.BoundedInputStream;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
index db29c1b..815ccb8 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
@@ -21,11 +21,11 @@ import java.io.InputStream;
import org.apache.commons.fileupload2.FileItemHeaders;
import org.apache.commons.fileupload2.FileItemStream;
+import org.apache.commons.fileupload2.FileUploadByteCountLimitException;
import org.apache.commons.fileupload2.FileUploadException;
import org.apache.commons.fileupload2.InvalidFileNameException;
import org.apache.commons.fileupload2.MultipartStream.ItemInputStream;
import org.apache.commons.fileupload2.disk.DiskFileItem;
-import org.apache.commons.fileupload2.pub.FileUploadByteCountLimitException;
import org.apache.commons.io.input.BoundedInputStream;
/**
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/package-info.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/package-info.java
deleted file mode 100644
index 6ffca2a..0000000
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/pub/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Exceptions, and other classes, that are known to be used outside of FileUpload.
- */
-package org.apache.commons.fileupload2.pub;
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/AbstractSizesTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/AbstractSizesTest.java
index 2795f2b..ab24491 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/AbstractSizesTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/AbstractSizesTest.java
@@ -27,8 +27,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import org.apache.commons.fileupload2.pub.FileUploadByteCountLimitException;
-import org.apache.commons.fileupload2.pub.FileUploadSizeException;
import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.Test;
diff --git a/src/site/apt/migration.apt.vm b/src/site/apt/migration.apt.vm
index 794ab13..779124b 100644
--- a/src/site/apt/migration.apt.vm
+++ b/src/site/apt/migration.apt.vm
@@ -157,5 +157,4 @@ Migrating
* Using Commons FileUpload 2 as a Java Module
The library provides <<META-INF/versions/module-info.class>> that defines the required modules and exported packages.
- All packages but <<org.apache.commons.fileupload2.impl>> are exported. All exception classes have been moved from
- <<org.apache.commons.fileupload2.impl>> to <<org.apache.commons.fileupload2.pub>> package
+ All packages but <<org.apache.commons.fileupload2.impl>> are exported.
[commons-fileupload] 03/08: Hide FileItemHeaders implementation details
Posted by gg...@apache.org.
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 e697ffca929ee8c497f20e5e758f9135796c8dbe
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 20:43:40 2023 -0400
Hide FileItemHeaders implementation details
---
.../java/org/apache/commons/fileupload2/AbstractFileUpload.java | 1 -
.../apache/commons/fileupload2/{util => }/FileItemHeadersImpl.java | 6 ++----
.../java/org/apache/commons/fileupload2/FileItemHeadersTest.java | 1 -
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
index 81542b5..a3a06d6 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
@@ -27,7 +27,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Objects;
-import org.apache.commons.fileupload2.util.FileItemHeadersImpl;
import org.apache.commons.io.IOUtils;
/**
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemHeadersImpl.java
similarity index 94%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemHeadersImpl.java
index d3c0c8f..9edba7d 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemHeadersImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util;
+package org.apache.commons.fileupload2;
import java.util.ArrayList;
import java.util.Collections;
@@ -24,12 +24,10 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.fileupload2.FileItemHeaders;
-
/**
* Default implementation of the {@link FileItemHeaders} interface.
*/
-public class FileItemHeadersImpl implements FileItemHeaders {
+class FileItemHeadersImpl implements FileItemHeaders {
/**
* Map of {@code String} keys to a {@code List} of {@code String} instances.
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/FileItemHeadersTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/FileItemHeadersTest.java
index bf02ce9..1a896dd 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/FileItemHeadersTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/FileItemHeadersTest.java
@@ -23,7 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Iterator;
-import org.apache.commons.fileupload2.util.FileItemHeadersImpl;
import org.junit.jupiter.api.Test;
/**