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/07/09 22:26:24 UTC
[commons-fileupload] 02/05: Rename abstract class
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 3e604e1f0d62fb5c5a680e6b61956f7c6f53e41e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jul 9 17:49:25 2023 -0400
Rename abstract class
---
.../apache/commons/fileupload2/core/AbstractFileUpload.java | 4 ++--
.../org/apache/commons/fileupload2/core/FileItemFactory.java | 12 ++++++------
.../apache/commons/fileupload2/core/disk/DiskFileItem.java | 4 ++--
.../fileupload2/core/disk/DiskFileItemFactoryTest.java | 4 ++--
.../commons/fileupload2/core/disk/DiskFileItemTest.java | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/AbstractFileUpload.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/AbstractFileUpload.java
index aeb1ec7..a25506e 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/AbstractFileUpload.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/AbstractFileUpload.java
@@ -28,7 +28,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Objects;
-import org.apache.commons.fileupload2.core.FileItemFactory.FileItemBuilder;
+import org.apache.commons.fileupload2.core.FileItemFactory.AbstractFileItemBuilder;
import org.apache.commons.io.IOUtils;
/**
@@ -369,7 +369,7 @@ public abstract class AbstractFileUpload<R, I extends FileItem<I>, F extends Fil
* @return The new instance.
*/
protected FileItemHeaders newFileItemHeaders() {
- return FileItemBuilder.newFileItemHeaders();
+ return AbstractFileItemBuilder.newFileItemHeaders();
}
/**
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/FileItemFactory.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/FileItemFactory.java
index e09f6ea..d9b2729 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/FileItemFactory.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/FileItemFactory.java
@@ -37,7 +37,7 @@ public interface FileItemFactory<I extends FileItem<I>> {
* @param <I> the type of {@link FileItem} to build.
* @param <B> the type of builder subclass.
*/
- abstract class FileItemBuilder<I extends FileItem<I>, B extends FileItemBuilder<I, B>> extends AbstractStreamBuilder<I, B> {
+ abstract class AbstractFileItemBuilder<I extends FileItem<I>, B extends AbstractFileItemBuilder<I, B>> extends AbstractStreamBuilder<I, B> {
public static FileItemHeaders newFileItemHeaders() {
return new FileItemHeadersImpl();
@@ -76,7 +76,7 @@ public interface FileItemFactory<I extends FileItem<I>> {
*/
private FileCleaningTracker fileCleaningTracker;
- public FileItemBuilder() {
+ public AbstractFileItemBuilder() {
setBufferSize(DiskFileItemFactory.DEFAULT_THRESHOLD);
setPath(PathUtils.getTempDirectory());
}
@@ -138,11 +138,11 @@ public interface FileItemFactory<I extends FileItem<I>> {
}
/**
- * Creates a new FileItemBuilder.
+ * Creates a new AbstractFileItemBuilder.
*
- * @param <B> The type of FileItemBuilder.
- * @return a new FileItemBuilder.
+ * @param <B> The type of AbstractFileItemBuilder.
+ * @return a new AbstractFileItemBuilder.
*/
- <B extends FileItemBuilder<I, B>> FileItemBuilder<I, B> fileItemBuilder();
+ <B extends AbstractFileItemBuilder<I, B>> AbstractFileItemBuilder<I, B> fileItemBuilder();
}
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/disk/DiskFileItem.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/disk/DiskFileItem.java
index 2787f68..90c804f 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/disk/DiskFileItem.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/disk/DiskFileItem.java
@@ -34,7 +34,7 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.fileupload2.core.FileItem;
-import org.apache.commons.fileupload2.core.FileItemFactory.FileItemBuilder;
+import org.apache.commons.fileupload2.core.FileItemFactory.AbstractFileItemBuilder;
import org.apache.commons.fileupload2.core.FileItemHeaders;
import org.apache.commons.fileupload2.core.FileUploadException;
import org.apache.commons.fileupload2.core.ParameterParser;
@@ -82,7 +82,7 @@ public final class DiskFileItem implements FileItem<DiskFileItem> {
* }
* </pre>
*/
- public static class Builder extends FileItemBuilder<DiskFileItem, Builder> {
+ public static class Builder extends AbstractFileItemBuilder<DiskFileItem, Builder> {
public Builder() {
setBufferSize(DiskFileItemFactory.DEFAULT_THRESHOLD);
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/disk/DiskFileItemFactoryTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/disk/DiskFileItemFactoryTest.java
index fd81b03..c1e41f9 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/disk/DiskFileItemFactoryTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/disk/DiskFileItemFactoryTest.java
@@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
-import org.apache.commons.fileupload2.core.FileItemFactory.FileItemBuilder;
+import org.apache.commons.fileupload2.core.FileItemFactory.AbstractFileItemBuilder;
import org.apache.commons.fileupload2.core.FileItemHeaders;
import org.apache.commons.fileupload2.core.disk.DiskFileItem.Builder;
import org.junit.jupiter.api.Test;
@@ -38,7 +38,7 @@ public class DiskFileItemFactoryTest {
final DiskFileItem fileItem = fileItemBuilder.get();
assertNotNull(fileItem.getHeaders(), "Missing default headers (empty)");
assertFalse(fileItem.getHeaders().getHeaderNames().hasNext());
- final FileItemHeaders fileItemHeaders = FileItemBuilder.newFileItemHeaders();
+ final FileItemHeaders fileItemHeaders = AbstractFileItemBuilder.newFileItemHeaders();
assertNotNull(fileItemHeaders);
fileItem.setHeaders(fileItemHeaders);
assertSame(fileItemHeaders, fileItem.getHeaders());
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/disk/DiskFileItemTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/disk/DiskFileItemTest.java
index 90ddcb7..602a85a 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/disk/DiskFileItemTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/disk/DiskFileItemTest.java
@@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
-import org.apache.commons.fileupload2.core.FileItemFactory.FileItemBuilder;
+import org.apache.commons.fileupload2.core.FileItemFactory.AbstractFileItemBuilder;
import org.apache.commons.fileupload2.core.FileItemHeaders;
import org.apache.commons.fileupload2.core.disk.DiskFileItem.Builder;
import org.junit.jupiter.api.Test;
@@ -38,7 +38,7 @@ public class DiskFileItemTest {
assertNotNull(fileItem.getHeaders(), "Missing default headers (empty)");
assertFalse(fileItem.getHeaders().getHeaderNames().hasNext());
assertNotNull(fileItem.getHeaders());
- final FileItemHeaders fileItemHeaders = FileItemBuilder.newFileItemHeaders();
+ final FileItemHeaders fileItemHeaders = AbstractFileItemBuilder.newFileItemHeaders();
assertNotNull(fileItemHeaders);
fileItem.setHeaders(fileItemHeaders);
assertSame(fileItemHeaders, fileItem.getHeaders());