diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java index e8de69083d99..84822deeccb4 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java @@ -439,22 +439,22 @@ static void closeChannel(@Nullable Channel channel) { * @since 6.1 */ public static Publisher outputStreamPublisher( - Consumer consumer, DataBufferFactory bufferFactory, Executor executor) { + OutputStreamHandler consumer, DataBufferFactory bufferFactory, Executor executor) { return new OutputStreamPublisher<>( - consumer::accept, new DataBufferMapper(bufferFactory), executor, null); + consumer, new DataBufferMapper(bufferFactory), executor, null); } /** - * Variant of {@link #outputStreamPublisher(Consumer, DataBufferFactory, Executor)} + * Variant of {@link #outputStreamPublisher(OutputStreamHandler, DataBufferFactory, Executor)} * providing control over the chunk sizes to be produced by the publisher. * @since 6.1 */ public static Publisher outputStreamPublisher( - Consumer consumer, DataBufferFactory bufferFactory, Executor executor, int chunkSize) { + OutputStreamHandler consumer, DataBufferFactory bufferFactory, Executor executor, int chunkSize) { return new OutputStreamPublisher<>( - consumer::accept, new DataBufferMapper(bufferFactory), executor, chunkSize); + consumer, new DataBufferMapper(bufferFactory), executor, chunkSize); } /** diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamHandler.java b/spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamHandler.java new file mode 100644 index 000000000000..e01b1fb3f000 --- /dev/null +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamHandler.java @@ -0,0 +1,32 @@ +/* + * Copyright 2002-2024 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.core.io.buffer; + +import java.io.IOException; +import java.io.OutputStream; + +/** + * Contract to provide callback access to the {@link OutputStream}. + * @author Rossen Stoyanchev + * @author Federico Pettinari + */ +@FunctionalInterface +public interface OutputStreamHandler { + + void handle(OutputStream outputStream) throws IOException; + +} diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamPublisher.java b/spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamPublisher.java index dc6cad91014d..1c2fbbd68f76 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamPublisher.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamPublisher.java @@ -99,17 +99,6 @@ public void subscribe(Subscriber subscriber) { } - /** - * Contract to provide callback access to the {@link OutputStream}. - */ - @FunctionalInterface - public interface OutputStreamHandler { - - void handle(OutputStream outputStream) throws Exception; - - } - - /** * Maps from bytes to byte buffers. * @param the type of byte buffer to map to diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java index 96fac2afbf04..8a57ee601655 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java @@ -19,7 +19,6 @@ import java.io.OutputStream; import java.util.List; import java.util.concurrent.Executor; -import java.util.function.Consumer; import org.reactivestreams.Publisher; import reactor.core.publisher.Mono; @@ -32,6 +31,7 @@ import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferFactory; import org.springframework.core.io.buffer.DataBufferUtils; +import org.springframework.core.io.buffer.OutputStreamHandler; import org.springframework.http.HttpEntity; import org.springframework.http.MediaType; import org.springframework.http.ReactiveHttpOutputMessage; @@ -397,10 +397,10 @@ public static > BodyInserter> BodyInserter fromOutputStream( - Consumer outputStreamConsumer, Executor executor) { + OutputStreamHandler outputStreamConsumer, Executor executor) { Assert.notNull(outputStreamConsumer, "OutputStreamConsumer must not be null"); Assert.notNull(executor, "Executor must not be null"); @@ -418,10 +418,10 @@ public static > BodyInserter> BodyInserter fromOutputStream( - Consumer outputStreamConsumer, Executor executor, int chunkSize) { + OutputStreamHandler outputStreamConsumer, Executor executor, int chunkSize) { Assert.notNull(outputStreamConsumer, "OutputStreamConsumer must not be null"); Assert.notNull(executor, "Executor must not be null");