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:52 UTC
[commons-fileupload] branch master updated (d9b6d13 -> 3aa1298)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
from d9b6d13 Use a builder
new 4d195d4 Use final
new 5872a58 transient not needed
new 3aa1298 Better builder
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/fileupload2/disk/DiskFileItem.java | 28 ++++++++--------------
1 file changed, 10 insertions(+), 18 deletions(-)
[commons-fileupload] 03/03: Better builder
Posted by 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 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;
[commons-fileupload] 01/03: Use final
Posted by 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 4d195d4ea5bd61991201515ca1d886a2810370fe
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jun 10 12:32:02 2023 -0400
Use final
---
.../org/apache/commons/fileupload2/disk/DiskFileItem.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 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 dc2522a..c027f6a 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
@@ -134,32 +134,32 @@ public final class DiskFileItem implements FileItem {
return new DiskFileItem(fieldName, contentType, isFormField, fileName, getBufferSize(), getPath(), fileItemHeaders, defaultCharset);
}
- public Builder setContentType(String contentType) {
+ public Builder setContentType(final String contentType) {
this.contentType = contentType;
return this;
}
- public Builder setDefaultCharset(Charset defaultCharset) {
+ public Builder setDefaultCharset(final Charset defaultCharset) {
this.defaultCharset = defaultCharset;
return this;
}
- public Builder setFieldName(String fieldName) {
+ public Builder setFieldName(final String fieldName) {
this.fieldName = fieldName;
return this;
}
- public Builder setFileItemHeaders(FileItemHeaders fileItemHeaders) {
+ public Builder setFileItemHeaders(final FileItemHeaders fileItemHeaders) {
this.fileItemHeaders = fileItemHeaders;
return this;
}
- public Builder setFileName(String fileName) {
+ public Builder setFileName(final String fileName) {
this.fileName = fileName;
return this;
}
- public Builder setFormField(boolean isFormField) {
+ public Builder setFormField(final boolean isFormField) {
this.isFormField = isFormField;
return this;
}
[commons-fileupload] 02/03: transient not needed
Posted by 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 5872a58a4913a8aa1668bc39f9dbe3576ef65f6c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jun 10 12:32:32 2023 -0400
transient not needed
---
.../main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java | 4 ++--
1 file changed, 2 insertions(+), 2 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 c027f6a..231de4c 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
@@ -284,12 +284,12 @@ public final class DiskFileItem implements FileItem {
/**
* Output stream for this item.
*/
- private transient DeferredFileOutputStream dfos;
+ private DeferredFileOutputStream dfos;
/**
* The temporary file to use.
*/
- private transient Path tempFile;
+ private Path tempFile;
/**
* The file items headers.