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 bf68f63cfb312ef4710fb3dfb4d8e4e1665f4497
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Jun 13 10:53:32 2025 -0400
Sort members
---
.../commons/fileupload2/core/MultipartInput.java | 54 ++++++++---------
.../fileupload2/core/MultipartStreamTest.java | 68 +++++++++++-----------
2 files changed, 61 insertions(+), 61 deletions(-)
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 60b828b7..326e62d8 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
@@ -141,6 +141,14 @@ public final class MultipartInput {
return new MultipartInput(getInputStream(), boundary,
getBufferSize(), getPartHeaderSizeMax(), progressNotifier);
}
+ /** Returns the per part size limit for headers.
+ * @return The maximum size of the headers in bytes.
+ * @since 2.0.0-M4
+ */
+ public int getPartHeaderSizeMax() {
+ return partHeaderSizeMax;
+ }
+
/**
* Sets the boundary.
*
@@ -152,34 +160,26 @@ public final class MultipartInput {
return this;
}
- /** 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
- */
- public Builder setPartHeaderSizeMax(final int partHeaderSizeMax) {
- this.partHeaderSizeMax = partHeaderSizeMax;
- return this;
- }
-
- /**
- * Sets the progress notifier.
- *
- * @param progressNotifier progress notifier.
- * @return {@code this} instance.
- */
- public Builder setProgressNotifier(final ProgressNotifier
progressNotifier) {
- this.progressNotifier = progressNotifier;
- return this;
- }
+ /** 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
+ */
+ public Builder setPartHeaderSizeMax(final int partHeaderSizeMax) {
+ this.partHeaderSizeMax = partHeaderSizeMax;
+ return this;
+ }
- /** Returns the per part size limit for headers.
- * @return The maximum size of the headers in bytes.
- * @since 2.0.0-M4
- */
- public int getPartHeaderSizeMax() {
- return partHeaderSizeMax;
- }
+ /**
+ * Sets the progress notifier.
+ *
+ * @param progressNotifier progress notifier.
+ * @return {@code this} instance.
+ */
+ public Builder setProgressNotifier(final ProgressNotifier
progressNotifier) {
+ this.progressNotifier = progressNotifier;
+ 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 c3b9938f..6f1ff4d8 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
@@ -36,40 +36,6 @@ class MultipartStreamTest {
static private final String BOUNDARY_TEXT = "myboundary";
- @Test
- void testSmallBuffer() {
- final var strData = "foobar";
- final var contents = strData.getBytes();
- final InputStream input = new ByteArrayInputStream(contents);
- final var boundary = BOUNDARY_TEXT.getBytes();
- final var iBufSize = 1;
- assertThrows(IllegalArgumentException.class, () ->
MultipartInput.builder().setInputStream(input).setBoundary(boundary).setBufferSize(iBufSize)
- .setProgressNotifier(new MultipartInput.ProgressNotifier(null,
contents.length)).get());
- }
-
- @Test
- void testThreeParamConstructor() throws Exception {
- final var strData = "foobar";
- final var contents = strData.getBytes();
- final InputStream input = new ByteArrayInputStream(contents);
- final var boundary = BOUNDARY_TEXT.getBytes();
- final var iBufSize = boundary.length +
MultipartInput.BOUNDARY_PREFIX.length + 1;
- final var ms =
MultipartInput.builder().setInputStream(input).setBoundary(boundary).setBufferSize(iBufSize)
- .setProgressNotifier(new MultipartInput.ProgressNotifier(null,
contents.length)).get();
- assertNotNull(ms);
- }
-
- @Test
- void testTwoParamConstructor() throws Exception {
- final var strData = "foobar";
- final var contents = strData.getBytes();
- final InputStream input = new ByteArrayInputStream(contents);
- final var boundary = BOUNDARY_TEXT.getBytes();
- final var ms =
MultipartInput.builder().setInputStream(input).setBoundary(boundary)
- .setProgressNotifier(new MultipartInput.ProgressNotifier(null,
contents.length)).get();
- assertNotNull(ms);
- }
-
/** Checks, whether the maxSize works.
*/
@Test
@@ -120,4 +86,38 @@ class MultipartStreamTest {
assertEquals(100, fuse.getPermitted());
}
}
+
+ @Test
+ void testSmallBuffer() {
+ final var strData = "foobar";
+ final var contents = strData.getBytes();
+ final InputStream input = new ByteArrayInputStream(contents);
+ final var boundary = BOUNDARY_TEXT.getBytes();
+ final var iBufSize = 1;
+ assertThrows(IllegalArgumentException.class, () ->
MultipartInput.builder().setInputStream(input).setBoundary(boundary).setBufferSize(iBufSize)
+ .setProgressNotifier(new MultipartInput.ProgressNotifier(null,
contents.length)).get());
+ }
+
+ @Test
+ void testThreeParamConstructor() throws Exception {
+ final var strData = "foobar";
+ final var contents = strData.getBytes();
+ final InputStream input = new ByteArrayInputStream(contents);
+ final var boundary = BOUNDARY_TEXT.getBytes();
+ final var iBufSize = boundary.length +
MultipartInput.BOUNDARY_PREFIX.length + 1;
+ final var ms =
MultipartInput.builder().setInputStream(input).setBoundary(boundary).setBufferSize(iBufSize)
+ .setProgressNotifier(new MultipartInput.ProgressNotifier(null,
contents.length)).get();
+ assertNotNull(ms);
+ }
+
+ @Test
+ void testTwoParamConstructor() throws Exception {
+ final var strData = "foobar";
+ final var contents = strData.getBytes();
+ final InputStream input = new ByteArrayInputStream(contents);
+ final var boundary = BOUNDARY_TEXT.getBytes();
+ final var ms =
MultipartInput.builder().setInputStream(input).setBoundary(boundary)
+ .setProgressNotifier(new MultipartInput.ProgressNotifier(null,
contents.length)).get();
+ assertNotNull(ms);
+ }
}
