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 2025/09/09 15:04:23 UTC
(commons-fileupload) 03/08: Rename MultipartInput.Builder.[get|set]PartHeaderSizeMax() to [get|set]MaxPartHeaderSize().
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 d2bdb49f2c891d549a20d324f2283674299e9a40
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Tue Sep 9 07:47:33 2025 -0700
Rename MultipartInput.Builder.[get|set]PartHeaderSizeMax() to
[get|set]MaxPartHeaderSize().
---
.../fileupload2/core/FileItemInputIteratorImpl.java | 2 +-
.../apache/commons/fileupload2/core/MultipartInput.java | 16 ++++++++--------
.../commons/fileupload2/core/MultipartStreamTest.java | 2 +-
src/changes/changes.xml | 1 +
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/FileItemInputIteratorImpl.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/FileItemInputIteratorImpl.java
index 23a60424..ca089124 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/FileItemInputIteratorImpl.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/FileItemInputIteratorImpl.java
@@ -294,7 +294,7 @@ class FileItemInputIteratorImpl implements FileItemInputIterator {
.setInputStream(inputStream)
.setBoundary(multiPartBoundary)
.setProgressNotifier(progressNotifier)
- .setPartHeaderSizeMax(fileUploadBase.getPartHeaderSizeMax())
+ .setMaxPartHeaderSize(fileUploadBase.getPartHeaderSizeMax())
.get();
} catch (final IllegalArgumentException e) {
IOUtils.closeQuietly(inputStream); // avoid possible resource leak
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/MultipartInput.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/MultipartInput.java
index 5e95a2fa..478dc827 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/MultipartInput.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/MultipartInput.java
@@ -112,7 +112,7 @@ public final class MultipartInput {
/** The per part size limit for headers.
*/
- private int partHeaderSizeMax = DEFAULT_PART_HEADER_SIZE_MAX;
+ private int maxPartHeaderSize = DEFAULT_PART_HEADER_SIZE_MAX;
/**
* Constructs a new instance.
@@ -138,17 +138,17 @@ public final class MultipartInput {
*/
@Override
public MultipartInput get() throws IOException {
- return new MultipartInput(getInputStream(), boundary, getBufferSize(), getPartHeaderSizeMax(), progressNotifier);
+ return new MultipartInput(getInputStream(), boundary, getBufferSize(), getMaxPartHeaderSize(), progressNotifier);
}
/**
* Gets the per part size limit for headers.
*
* @return The maximum size of the headers in bytes.
- * @since 2.0.0-M4
+ * @since 2.0.0-M5
*/
- public int getPartHeaderSizeMax() {
- return partHeaderSizeMax;
+ public int getMaxPartHeaderSize() {
+ return maxPartHeaderSize;
}
/**
@@ -165,10 +165,10 @@ public final class MultipartInput {
/** Sets the per part size limit for headers.
* @param partHeaderSizeMax The maximum size of the headers in bytes.
* @return This builder.
- * @since 2.0.0-M4
+ * @since 2.0.0-M5
*/
- public Builder setPartHeaderSizeMax(final int partHeaderSizeMax) {
- this.partHeaderSizeMax = partHeaderSizeMax;
+ public Builder setMaxPartHeaderSize(final int partHeaderSizeMax) {
+ this.maxPartHeaderSize = partHeaderSizeMax;
return this;
}
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MultipartStreamTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MultipartStreamTest.java
index 60c8d3df..a7a08099 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MultipartStreamTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MultipartStreamTest.java
@@ -48,7 +48,7 @@ class MultipartStreamTest {
final byte[] byteContents = request.getBytes(StandardCharsets.UTF_8);
final InputStream input = new ByteArrayInputStream(byteContents);
final byte[] boundary = "---1234".getBytes();
- final MultipartInput mi = MultipartInput.builder().setInputStream(input).setBoundary(boundary).setPartHeaderSizeMax(100).get();
+ final MultipartInput mi = MultipartInput.builder().setInputStream(input).setBoundary(boundary).setMaxPartHeaderSize(100).get();
assertNotNull(mi);
try {
boolean nextPart = mi.skipPreamble();
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a03f786b..45a25941 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,6 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="fix" dev="ggregory" due-to="Chenjp, Gary Gregory">Better exception message in org.apache.commons.fileupload2.core.AbstractFileUpload.parseRequest(RequestContext).</action>
<action issue="FILEUPLOAD-295" type="fix" dev="jochen">Clarified the precise meaning of isInMemory(), get(), getPath(), etc. in DiskFileItem</action>
<action type="fix" dev="markt" due-to="Coverity Scan">Better exception type and message if a multipart/mixed part is presented without a boundary defined</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">Rename MultipartInput.Builder.[get|set]PartHeaderSizeMax() to [get|set]MaxPartHeaderSize().</action>
<!-- ADD -->
<action type="add" dev="ggregory" due-to="Ryan J Murphy">Add AbstractFileUpload support for a maximum part header size #429.</action>
<!-- UPDATE -->