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:12 UTC
[commons-fileupload] 02/08: Hide FileItemIterator implementation details
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;