This is an automated email from the ASF dual-hosted git repository.
jochen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
The following commit(s) were added to refs/heads/master by this push:
new 8fa525d PR: FILEUPLOAD-341 Move Exception classes out of impl
8fa525d is described below
commit 8fa525dd420dcfcec0341a445b0d06c811731d99
Author: Jochen Wiedmann <jochen.wiedm...@gmail.com>
AuthorDate: Fri Aug 20 10:42:51 2021 +0200
PR: FILEUPLOAD-341 Move Exception classes out of impl
---
src/changes/changes.xml | 1 +
.../commons/fileupload2/FileItemIterator.java | 4 ++--
.../apache/commons/fileupload2/FileUploadBase.java | 4 ++--
.../commons/fileupload2/MultipartStream.java | 2 +-
.../fileupload2/impl/FileItemIteratorImpl.java | 3 +++
.../fileupload2/impl/FileItemStreamImpl.java | 2 ++
.../FileSizeLimitExceededException.java | 2 +-
.../{impl => pub}/FileUploadIOException.java | 2 +-
.../{impl => pub}/IOFileUploadException.java | 2 +-
.../{impl => pub}/InvalidContentTypeException.java | 2 +-
.../fileupload2/{impl => pub}/SizeException.java | 2 +-
.../{impl => pub}/SizeLimitExceededException.java | 2 +-
.../{impl => pub}/UnknownSizeException.java | 2 +-
.../commons/fileupload2/pub/package-info.java | 22 ++++++++++++++++++++++
.../commons/fileupload2/DiskFileUploadTest.java | 2 +-
.../org/apache/commons/fileupload2/SizesTest.java | 6 +++---
.../apache/commons/fileupload2/StreamingTest.java | 2 +-
17 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9d1cbbc..5b15bf3 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,7 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" type="update"
due-to="Dependabot">Bump spotbugs-maven-plugin from 4.2.3 to 4.3.0
#103.</action>
<action dev="mgrigorov"
type="update">FILEUPLOAD-340 Make commons-fileupload2 a JPMS module by adding
module-info.class.</action>
<action dev="jochen" type="update"
due-to="Dependabot">Update Spotbugs from 4.2.3 to 4.4.0, ignore EI_EXPOSE_REP,
and EI_EXPOSE_REP2.</action>
+ <action issue="FILEUPLOAD-341" dev="jochen" type="update" due-to="Martin
Grigorov">Move Exception classes out of the impl package.</action>
</release>
<release version="1.4" date="2018-12-23" description="1.4 Release">
<action issue="FILEUPLOAD-292" dev="chtompki" type="update">Don't create
un-needed resources in FileUploadBase.java</action>
diff --git a/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
b/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
index ae97bc0..bae9532 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileItemIterator.java
@@ -19,8 +19,8 @@ package org.apache.commons.fileupload2;
import java.io.IOException;
import java.util.List;
-import org.apache.commons.fileupload2.impl.FileSizeLimitExceededException;
-import org.apache.commons.fileupload2.impl.SizeLimitExceededException;
+import org.apache.commons.fileupload2.pub.FileSizeLimitExceededException;
+import org.apache.commons.fileupload2.pub.SizeLimitExceededException;
/**
* An iterator, as returned by
diff --git a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
index 1626077..8ed5f72 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
@@ -31,8 +31,8 @@ import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.fileupload2.impl.FileItemIteratorImpl;
-import org.apache.commons.fileupload2.impl.FileUploadIOException;
-import org.apache.commons.fileupload2.impl.IOFileUploadException;
+import org.apache.commons.fileupload2.pub.FileUploadIOException;
+import org.apache.commons.fileupload2.pub.IOFileUploadException;
import org.apache.commons.fileupload2.servlet.ServletFileUpload;
import org.apache.commons.fileupload2.servlet.ServletRequestContext;
import org.apache.commons.fileupload2.util.FileItemHeadersImpl;
diff --git a/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
b/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
index e7ff716..6623eae 100644
--- a/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
+++ b/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-import org.apache.commons.fileupload2.impl.FileUploadIOException;
+import org.apache.commons.fileupload2.pub.FileUploadIOException;
import org.apache.commons.fileupload2.util.Closeable;
import org.apache.commons.fileupload2.util.Streams;
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 c320f02..9a1a0f5 100644
---
a/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
+++
b/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
@@ -36,6 +36,9 @@ 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.FileUploadIOException;
+import org.apache.commons.fileupload2.pub.InvalidContentTypeException;
+import org.apache.commons.fileupload2.pub.SizeLimitExceededException;
import org.apache.commons.fileupload2.util.LimitedInputStream;
import org.apache.commons.io.IOUtils;
diff --git
a/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
b/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
index e3a9b25..d06ff38 100644
--- a/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
+++ b/src/main/java/org/apache/commons/fileupload2/impl/FileItemStreamImpl.java
@@ -26,6 +26,8 @@ import org.apache.commons.fileupload2.FileItemStream;
import org.apache.commons.fileupload2.FileUploadException;
import org.apache.commons.fileupload2.InvalidFileNameException;
import org.apache.commons.fileupload2.MultipartStream.ItemInputStream;
+import org.apache.commons.fileupload2.pub.FileSizeLimitExceededException;
+import org.apache.commons.fileupload2.pub.FileUploadIOException;
import org.apache.commons.fileupload2.util.Closeable;
import org.apache.commons.fileupload2.util.LimitedInputStream;
import org.apache.commons.fileupload2.util.Streams;
diff --git
a/src/main/java/org/apache/commons/fileupload2/impl/FileSizeLimitExceededException.java
b/src/main/java/org/apache/commons/fileupload2/pub/FileSizeLimitExceededException.java
similarity index 95%
rename from
src/main/java/org/apache/commons/fileupload2/impl/FileSizeLimitExceededException.java
rename to
src/main/java/org/apache/commons/fileupload2/pub/FileSizeLimitExceededException.java
index 327d365..bb45be0 100644
---
a/src/main/java/org/apache/commons/fileupload2/impl/FileSizeLimitExceededException.java
+++
b/src/main/java/org/apache/commons/fileupload2/pub/FileSizeLimitExceededException.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.pub;
/**
* Thrown to indicate that A files size exceeds the configured maximum.
diff --git
a/src/main/java/org/apache/commons/fileupload2/impl/FileUploadIOException.java
b/src/main/java/org/apache/commons/fileupload2/pub/FileUploadIOException.java
similarity index 94%
rename from
src/main/java/org/apache/commons/fileupload2/impl/FileUploadIOException.java
rename to
src/main/java/org/apache/commons/fileupload2/pub/FileUploadIOException.java
index 11b2398..7f25d7c 100644
---
a/src/main/java/org/apache/commons/fileupload2/impl/FileUploadIOException.java
+++
b/src/main/java/org/apache/commons/fileupload2/pub/FileUploadIOException.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.pub;
import java.io.IOException;
diff --git
a/src/main/java/org/apache/commons/fileupload2/impl/IOFileUploadException.java
b/src/main/java/org/apache/commons/fileupload2/pub/IOFileUploadException.java
similarity index 94%
rename from
src/main/java/org/apache/commons/fileupload2/impl/IOFileUploadException.java
rename to
src/main/java/org/apache/commons/fileupload2/pub/IOFileUploadException.java
index 942a538..b93566d 100644
---
a/src/main/java/org/apache/commons/fileupload2/impl/IOFileUploadException.java
+++
b/src/main/java/org/apache/commons/fileupload2/pub/IOFileUploadException.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.pub;
import java.io.IOException;
diff --git
a/src/main/java/org/apache/commons/fileupload2/impl/InvalidContentTypeException.java
b/src/main/java/org/apache/commons/fileupload2/pub/InvalidContentTypeException.java
similarity index 94%
rename from
src/main/java/org/apache/commons/fileupload2/impl/InvalidContentTypeException.java
rename to
src/main/java/org/apache/commons/fileupload2/pub/InvalidContentTypeException.java
index fd09276..5fbb9c7 100644
---
a/src/main/java/org/apache/commons/fileupload2/impl/InvalidContentTypeException.java
+++
b/src/main/java/org/apache/commons/fileupload2/pub/InvalidContentTypeException.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.pub;
import org.apache.commons.fileupload2.FileUploadException;
diff --git
a/src/main/java/org/apache/commons/fileupload2/impl/SizeException.java
b/src/main/java/org/apache/commons/fileupload2/pub/SizeException.java
similarity index 94%
rename from src/main/java/org/apache/commons/fileupload2/impl/SizeException.java
rename to src/main/java/org/apache/commons/fileupload2/pub/SizeException.java
index 8ac2bee..f1cc963 100644
--- a/src/main/java/org/apache/commons/fileupload2/impl/SizeException.java
+++ b/src/main/java/org/apache/commons/fileupload2/pub/SizeException.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.pub;
import org.apache.commons.fileupload2.FileUploadException;
diff --git
a/src/main/java/org/apache/commons/fileupload2/impl/SizeLimitExceededException.java
b/src/main/java/org/apache/commons/fileupload2/pub/SizeLimitExceededException.java
similarity index 94%
rename from
src/main/java/org/apache/commons/fileupload2/impl/SizeLimitExceededException.java
rename to
src/main/java/org/apache/commons/fileupload2/pub/SizeLimitExceededException.java
index cfe9628..c9c7343 100644
---
a/src/main/java/org/apache/commons/fileupload2/impl/SizeLimitExceededException.java
+++
b/src/main/java/org/apache/commons/fileupload2/pub/SizeLimitExceededException.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.pub;
/**
* Thrown to indicate that the request size exceeds the configured maximum.
diff --git
a/src/main/java/org/apache/commons/fileupload2/impl/UnknownSizeException.java
b/src/main/java/org/apache/commons/fileupload2/pub/UnknownSizeException.java
similarity index 94%
rename from
src/main/java/org/apache/commons/fileupload2/impl/UnknownSizeException.java
rename to
src/main/java/org/apache/commons/fileupload2/pub/UnknownSizeException.java
index 41dfa9e..1f4e0bf 100644
---
a/src/main/java/org/apache/commons/fileupload2/impl/UnknownSizeException.java
+++ b/src/main/java/org/apache/commons/fileupload2/pub/UnknownSizeException.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.pub;
import org.apache.commons.fileupload2.FileUploadException;
diff --git a/src/main/java/org/apache/commons/fileupload2/pub/package-info.java
b/src/main/java/org/apache/commons/fileupload2/pub/package-info.java
new file mode 100644
index 0000000..1b8698b
--- /dev/null
+++ b/src/main/java/org/apache/commons/fileupload2/pub/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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/src/test/java/org/apache/commons/fileupload2/DiskFileUploadTest.java
b/src/test/java/org/apache/commons/fileupload2/DiskFileUploadTest.java
index 37df62d..eb18dad 100644
--- a/src/test/java/org/apache/commons/fileupload2/DiskFileUploadTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/DiskFileUploadTest.java
@@ -24,7 +24,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.fileupload2.disk.DiskFileItem;
-import org.apache.commons.fileupload2.impl.InvalidContentTypeException;
+import org.apache.commons.fileupload2.pub.InvalidContentTypeException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/fileupload2/SizesTest.java
b/src/test/java/org/apache/commons/fileupload2/SizesTest.java
index a254f34..7dd1916 100644
--- a/src/test/java/org/apache/commons/fileupload2/SizesTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/SizesTest.java
@@ -31,9 +31,9 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.fileupload2.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload2.impl.FileSizeLimitExceededException;
-import org.apache.commons.fileupload2.impl.FileUploadIOException;
-import org.apache.commons.fileupload2.impl.SizeLimitExceededException;
+import org.apache.commons.fileupload2.pub.FileSizeLimitExceededException;
+import org.apache.commons.fileupload2.pub.FileUploadIOException;
+import org.apache.commons.fileupload2.pub.SizeLimitExceededException;
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/StreamingTest.java
b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
index 801d571..39a9e0e 100644
--- a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
@@ -32,7 +32,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.fileupload2.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload2.impl.IOFileUploadException;
+import org.apache.commons.fileupload2.pub.IOFileUploadException;
import org.apache.commons.fileupload2.servlet.ServletFileUpload;
import org.apache.commons.fileupload2.servlet.ServletRequestContext;
import org.junit.jupiter.api.Test;
