From 3e33912624057c3aa3c77dd72e93ac698cff110b Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Mon, 10 Oct 2022 11:48:30 +0200 Subject: [PATCH] Deprecate streaming mode in DefaultPartHttpMessageReader This commit deprecates the streaming mode of DefaultPartHttpMessageReader, in favor of PartEvent and PartEventHttpMessageReader. Closes gh-29293 --- .../http/codec/multipart/DefaultPartHttpMessageReader.java | 6 +++--- .../codec/multipart/DefaultPartHttpMessageReaderTests.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java index 2700892e72f..a694e43437a 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java +++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java @@ -49,9 +49,6 @@ import org.springframework.util.Assert; * {@link #setMaxInMemorySize(int) maxInMemorySize} in memory, and parts larger * than that to a temporary file in * {@link #setFileStorageDirectory(Path) fileStorageDirectory}. - *

In {@linkplain #setStreaming(boolean) streaming} mode, the contents of the - * part is streamed directly from the parsed input buffer stream, and not stored - * in memory nor file. * *

This reader can be provided to {@link MultipartHttpMessageReader} in order * to aggregate all parts into a Map. @@ -181,7 +178,10 @@ public class DefaultPartHttpMessageReader extends LoggingCodecSupport implements * {@link #setMaxDiskUsagePerPart(long) maxDiskUsagePerPart}, * {@link #setFileStorageDirectory(Path) fileStorageDirectory}, and * {@link #setBlockingOperationScheduler(Scheduler) fileCreationScheduler}. + * @deprecated as of 6.0, in favor of {@link PartEvent} and + * {@link PartEventHttpMessageReader} */ + @Deprecated(since = "6.0", forRemoval = true) public void setStreaming(boolean streaming) { this.streaming = streaming; } diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java index d86c5bda8f5..1c9596fb5b1 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java @@ -418,16 +418,15 @@ class DefaultPartHttpMessageReaderTests { @interface ParameterizedDefaultPartHttpMessageReaderTest { } + @SuppressWarnings("removal") static Stream messageReaders() { DefaultPartHttpMessageReader streaming = new DefaultPartHttpMessageReader(); streaming.setStreaming(true); DefaultPartHttpMessageReader inMemory = new DefaultPartHttpMessageReader(); - inMemory.setStreaming(false); inMemory.setMaxInMemorySize(1000); DefaultPartHttpMessageReader onDisk = new DefaultPartHttpMessageReader(); - onDisk.setStreaming(false); onDisk.setMaxInMemorySize(100); return Stream.of(