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/10 16:51:55 UTC

[commons-fileupload] 03/03: Better builder

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 3aa1298001e2e1a9d514fe6cefc55228844187f2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jun 10 12:51:48 2023 -0400

    Better builder
---
 .../org/apache/commons/fileupload2/disk/DiskFileItem.java  | 14 +++-----------
 1 file changed, 3 insertions(+), 11 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 231de4c..ee4e628 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
@@ -105,14 +105,11 @@ public final class DiskFileItem implements FileItem {
          */
         private FileItemHeaders fileItemHeaders;
 
-        /**
-         * Default Charest.
-         */
-        private Charset defaultCharset;
-
         public Builder() {
             setBufferSize(DiskFileItemFactory.DEFAULT_THRESHOLD);
             setPath(PathUtils.getTempDirectory());
+            setCharset(DEFAULT_CHARSET);
+            setCharsetDefault(DEFAULT_CHARSET);
         }
 
         /**
@@ -131,7 +128,7 @@ public final class DiskFileItem implements FileItem {
          */
         @Override
         public DiskFileItem get() {
-            return new DiskFileItem(fieldName, contentType, isFormField, fileName, getBufferSize(), getPath(), fileItemHeaders, defaultCharset);
+            return new DiskFileItem(fieldName, contentType, isFormField, fileName, getBufferSize(), getPath(), fileItemHeaders, getCharset());
         }
 
         public Builder setContentType(final String contentType) {
@@ -139,11 +136,6 @@ public final class DiskFileItem implements FileItem {
             return this;
         }
 
-        public Builder setDefaultCharset(final Charset defaultCharset) {
-            this.defaultCharset = defaultCharset;
-            return this;
-        }
-
         public Builder setFieldName(final String fieldName) {
             this.fieldName = fieldName;
             return this;