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

Shorten getter for ReactiveAdapterRegistry

Browse Source
This commit is contained in:
Rossen Stoyanchev
2016-07-27 17:03:56 -04:00
parent 143b5c89dd
commit 460ed307ed
6 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/ContentNegotiatingResultHandlerSupport.java
View File

@@ -67,7 +67,7 @@ public abstract class ContentNegotiatingResultHandlerSupport implements Ordered
/**
* Return the configured {@link ReactiveAdapterRegistry}.
*/
public ReactiveAdapterRegistry getReactiveAdapterRegistry() {
public ReactiveAdapterRegistry getAdapterRegistry() {
return this.adapterRegistry;
}

4
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
View File

@@ -106,7 +106,7 @@ public abstract class AbstractMessageReaderArgumentResolver {
/**
* Return the configured {@link ReactiveAdapterRegistry}.
*/
public ReactiveAdapterRegistry getReactiveAdapterRegistry() {
public ReactiveAdapterRegistry getAdapterRegistry() {
return this.adapterRegistry;
}
@@ -115,7 +115,7 @@ public abstract class AbstractMessageReaderArgumentResolver {
ServerWebExchange exchange) {
Class<?> bodyType = ResolvableType.forMethodParameter(bodyParameter).resolve();
ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterTo(bodyType);
ReactiveAdapter adapter = getAdapterRegistry().getAdapterTo(bodyType);
ResolvableType elementType = ResolvableType.forMethodParameter(bodyParameter);
if (adapter != null) {

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
View File

@@ -91,7 +91,7 @@ public abstract class AbstractMessageWriterResultHandler extends ContentNegotiat
protected Mono<Void> writeBody(Object body, MethodParameter bodyType, ServerWebExchange exchange) {
Class<?> bodyClass = bodyType.getParameterType();
ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(bodyClass, body);
ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(bodyClass, body);
Publisher<?> publisher;
ResolvableType elementType;

3
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java
View File

@@ -103,8 +103,7 @@ public class ResponseBodyResultHandler extends AbstractMessageWriterResultHandle
return true;
}
else {
Optional<Object> optional = result.getReturnValue();
ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(rawClass, optional);
ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(rawClass, result.getReturnValue());
if (adapter != null && !adapter.getDescriptor().isNoValue()) {
ResolvableType genericType = result.getReturnType().getGeneric(0);
if (HttpEntity.class.isAssignableFrom(genericType.getRawClass())) {

5
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
View File

@@ -85,8 +85,7 @@ public class ResponseEntityResultHandler extends AbstractMessageWriterResultHand
return true;
}
else {
Optional<Object> optional = result.getReturnValue();
ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(returnType, optional);
ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(returnType, result.getReturnValue());
if (adapter != null &&
!adapter.getDescriptor().isMultiValue() &&
!adapter.getDescriptor().isNoValue()) {
@@ -113,7 +112,7 @@ public class ResponseEntityResultHandler extends AbstractMessageWriterResultHand
Optional<Object> optionalValue = result.getReturnValue();
Class<?> rawClass = returnType.getRawClass();
ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(rawClass, optionalValue);
ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(rawClass, optionalValue);
if (adapter != null) {
returnValueMono = adapter.toMono(optionalValue);

11
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java
View File

@@ -143,7 +143,7 @@ public class ViewResolutionResultHandler extends ContentNegotiatingResultHandler
return true;
}
Optional<Object> optional = result.getReturnValue();
ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(clazz, optional);
ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(clazz, optional);
if (adapter != null) {
if (adapter.getDescriptor().isNoValue()) {
return true;
@@ -177,12 +177,11 @@ public class ViewResolutionResultHandler extends ContentNegotiatingResultHandler
ResolvableType elementType;
ResolvableType returnType = result.getReturnType();
Class<?> rawClass = returnType.getRawClass();
Optional<Object> optionalValue = result.getReturnValue();
ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(rawClass, optionalValue);
Optional<Object> optional = result.getReturnValue();
ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(returnType.getRawClass(), optional);
if (adapter != null) {
if (optionalValue.isPresent()) {
Mono<?> converted = adapter.toMono(optionalValue);
if (optional.isPresent()) {
Mono<?> converted = adapter.toMono(optional);
valueMono = converted.map(o -> o);
}
else {