From 03fe209862e2609f9bd25725b501b9c6bf0c751a Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Fri, 27 May 2016 10:37:04 +0200 Subject: [PATCH] Renamed ReactiveHttpOutputMessage dataBufferFactory() method to bufferFactory() --- .../org/springframework/http/ReactiveHttpOutputMessage.java | 2 +- .../http/client/reactive/ReactorClientHttpRequest.java | 2 +- .../http/client/reactive/RxNettyClientHttpRequest.java | 2 +- .../http/converter/reactive/CodecHttpMessageConverter.java | 2 +- .../http/server/reactive/AbstractServerHttpResponse.java | 2 +- .../web/client/reactive/DefaultHttpRequestBuilder.java | 2 +- .../http/server/reactive/MockServerHttpResponse.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java b/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java index 4e84c91886..686a780583 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java @@ -54,6 +54,6 @@ public interface ReactiveHttpOutputMessage extends HttpMessage { * @return a buffer factory * @see #setBody(Publisher) */ - DataBufferFactory dataBufferFactory(); + DataBufferFactory bufferFactory(); } diff --git a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java index d97c495d75..fff7f7a485 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java @@ -63,7 +63,7 @@ public class ReactorClientHttpRequest extends AbstractClientHttpRequest { } @Override - public DataBufferFactory dataBufferFactory() { + public DataBufferFactory bufferFactory() { return this.dataBufferFactory; } diff --git a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/RxNettyClientHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/RxNettyClientHttpRequest.java index 46d9550c31..aa45ed7404 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/RxNettyClientHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/RxNettyClientHttpRequest.java @@ -61,7 +61,7 @@ public class RxNettyClientHttpRequest extends AbstractClientHttpRequest { } @Override - public DataBufferFactory dataBufferFactory() { + public DataBufferFactory bufferFactory() { return this.dataBufferFactory; } diff --git a/spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/CodecHttpMessageConverter.java b/spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/CodecHttpMessageConverter.java index 3544bf0531..e48716b794 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/CodecHttpMessageConverter.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/CodecHttpMessageConverter.java @@ -128,7 +128,7 @@ public class CodecHttpMessageConverter implements HttpMessageConverter { if (headers.getContentType() == null) { headers.setContentType(contentType); } - DataBufferFactory dataBufferFactory = outputMessage.dataBufferFactory(); + DataBufferFactory dataBufferFactory = outputMessage.bufferFactory(); Flux body = this.encoder.encode(inputStream, dataBufferFactory, type, contentType); return outputMessage.setBody(body); diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java index 5700146307..34566e8ff0 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java @@ -66,7 +66,7 @@ public abstract class AbstractServerHttpResponse implements ServerHttpResponse { } @Override - public final DataBufferFactory dataBufferFactory() { + public final DataBufferFactory bufferFactory() { return this.dataBufferFactory; } diff --git a/spring-web-reactive/src/main/java/org/springframework/web/client/reactive/DefaultHttpRequestBuilder.java b/spring-web-reactive/src/main/java/org/springframework/web/client/reactive/DefaultHttpRequestBuilder.java index d57db2042c..5293508c93 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/client/reactive/DefaultHttpRequestBuilder.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/client/reactive/DefaultHttpRequestBuilder.java @@ -149,7 +149,7 @@ public class DefaultHttpRequestBuilder implements HttpRequestBuilder { if (messageEncoder.isPresent()) { request.setBody(messageEncoder.get() - .encode(this.contentPublisher, request.dataBufferFactory(), + .encode(this.contentPublisher, request.bufferFactory(), requestBodyType, mediaType)); } else { diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpResponse.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpResponse.java index baae492abf..3a6ea38952 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpResponse.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpResponse.java @@ -86,7 +86,7 @@ public class MockServerHttpResponse implements ServerHttpResponse { } @Override - public DataBufferFactory dataBufferFactory() { + public DataBufferFactory bufferFactory() { return this.dataBufferFactory; }