[commons-fileupload] 01/08: No benefit in packaging exceptions classes separately

[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.