Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2019-05-03 14:23:59 +02:00
parent fc8d5c068c 84266d71e9
commit ec8689d1fc
6 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeStrategies.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 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.
@@ -37,18 +37,18 @@ public interface ExchangeStrategies {
/**
* Return {@link HttpMessageReader HttpMessageReaders} to read and decode the response body with.
* @return the stream of message readers
* @return the message readers
*/
List<HttpMessageReader<?>> messageReaders();
/**
* Return {@link HttpMessageWriter HttpMessageWriters} to write and encode the request body with.
* @return the stream of message writers
* @return the message writers
*/
List<HttpMessageWriter<?>> messageWriters();
// Static methods
// Static builder methods
/**
* Return a new {@code ExchangeStrategies} with default configuration

13
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/HandlerStrategies.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 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.
@@ -28,10 +28,11 @@ import org.springframework.web.server.WebFilter;
import org.springframework.web.server.i18n.LocaleContextResolver;
/**
* Defines the strategies to be used for processing {@link HandlerFunction HandlerFunctions}. An instance of
* this class is immutable; instances are typically created through the mutable {@link Builder}:
* either through {@link #builder()} to set up default strategies, or {@link #empty()} to start from
* scratch.
* Defines the strategies to be used for processing {@link HandlerFunction HandlerFunctions}.
*
* <p>An instance of this class is immutable. Instances are typically created through the
* mutable {@link Builder}: either through {@link #builder()} to set up default strategies,
* or {@link #empty()} to start from scratch.
*
* @author Arjen Poutsma
* @author Juergen Hoeller
@@ -78,7 +79,7 @@ public interface HandlerStrategies {
LocaleContextResolver localeContextResolver();
// Static methods
// Static builder methods
/**
* Return a new {@code HandlerStrategies} with default initialization.