From dffd6d674ab9415caed1b82755634f52383cd7ba Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 1 Jul 2016 18:00:31 -0400 Subject: [PATCH] Shorten returnValueType name in HandlerResult --- .../web/reactive/HandlerResult.java | 20 +++++++++---------- .../reactive/result/SimpleResultHandler.java | 7 +++---- .../annotation/ResponseBodyResultHandler.java | 4 ++-- .../ResponseEntityResultHandler.java | 6 +++--- .../view/ViewResolutionResultHandler.java | 6 +++--- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java index 3c211e56440..437283c22e9 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java @@ -37,7 +37,7 @@ public class HandlerResult { private final Optional returnValue; - private final ResolvableType returnValueType; + private final ResolvableType returnType; private final ModelMap model; @@ -48,25 +48,25 @@ public class HandlerResult { * Create a new {@code HandlerResult}. * @param handler the handler that handled the request * @param returnValue the return value from the handler possibly {@code null} - * @param returnValueType the return value type + * @param returnType the return value type */ - public HandlerResult(Object handler, Object returnValue, ResolvableType returnValueType) { - this(handler, returnValue, returnValueType, null); + public HandlerResult(Object handler, Object returnValue, ResolvableType returnType) { + this(handler, returnValue, returnType, null); } /** * Create a new {@code HandlerResult}. * @param handler the handler that handled the request * @param returnValue the return value from the handler possibly {@code null} - * @param returnValueType the return value type + * @param returnType the return value type * @param model the model used for request handling */ - public HandlerResult(Object handler, Object returnValue, ResolvableType returnValueType, ModelMap model) { + public HandlerResult(Object handler, Object returnValue, ResolvableType returnType, ModelMap model) { Assert.notNull(handler, "'handler' is required"); - Assert.notNull(returnValueType, "'returnValueType' is required"); + Assert.notNull(returnType, "'returnType' is required"); this.handler = handler; this.returnValue = Optional.ofNullable(returnValue); - this.returnValueType = returnValueType; + this.returnType = returnType; this.model = (model != null ? model : new ExtendedModelMap()); } @@ -88,8 +88,8 @@ public class HandlerResult { /** * Return the type of the value returned from the handler. */ - public ResolvableType getReturnValueType() { - return this.returnValueType; + public ResolvableType getReturnType() { + return this.returnType; } /** diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/SimpleResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/SimpleResultHandler.java index 3b4818a4ed9..bff817cc2f9 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/SimpleResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/SimpleResultHandler.java @@ -18,7 +18,6 @@ package org.springframework.web.reactive.result; import java.util.Optional; -import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -80,13 +79,13 @@ public class SimpleResultHandler implements Ordered, HandlerResultHandler { @Override public boolean supports(HandlerResult result) { - ResolvableType type = result.getReturnValueType(); + ResolvableType type = result.getReturnType(); if (Void.TYPE.equals(type.getRawClass())) { return true; } if (getConversionService().canConvert(type.getRawClass(), Mono.class) || getConversionService().canConvert(type.getRawClass(), Flux.class)) { - Class clazz = result.getReturnValueType().getGeneric(0).getRawClass(); + Class clazz = result.getReturnType().getGeneric(0).getRawClass(); return Void.class.equals(clazz); } return false; @@ -105,7 +104,7 @@ public class SimpleResultHandler implements Ordered, HandlerResultHandler { return (Mono) returnValue; } - ResolvableType returnType = result.getReturnValueType(); + ResolvableType returnType = result.getReturnType(); if (getConversionService().canConvert(returnType.getRawClass(), Mono.class)) { return this.conversionService.convert(returnValue, Mono.class); } diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java index e0ce99ee1c7..4ac01a55b32 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java @@ -85,7 +85,7 @@ public class ResponseBodyResultHandler extends AbstractMessageConverterResultHan @Override public boolean supports(HandlerResult result) { - ResolvableType returnType = result.getReturnValueType(); + ResolvableType returnType = result.getReturnType(); if (returnType.getSource() instanceof MethodParameter) { MethodParameter parameter = (MethodParameter) returnType.getSource(); if (hasResponseBodyAnnotation(parameter) && !isHttpEntityType(returnType)) { @@ -118,7 +118,7 @@ public class ResponseBodyResultHandler extends AbstractMessageConverterResultHan @Override public Mono handleResult(ServerWebExchange exchange, HandlerResult result) { Object body = result.getReturnValue().orElse(null); - ResolvableType bodyType = result.getReturnValueType(); + ResolvableType bodyType = result.getReturnType(); return writeBody(exchange, body, bodyType); } diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java index 561bf0578dc..5ebc8f8cfa8 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java @@ -78,12 +78,12 @@ public class ResponseEntityResultHandler extends AbstractMessageConverterResultH @Override public boolean supports(HandlerResult result) { - ResolvableType returnType = result.getReturnValueType(); + ResolvableType returnType = result.getReturnType(); if (isSupportedType(returnType)) { return true; } else if (getConversionService().canConvert(returnType.getRawClass(), Mono.class)) { - ResolvableType genericType = result.getReturnValueType().getGeneric(0); + ResolvableType genericType = result.getReturnType().getGeneric(0); return isSupportedType(genericType); } @@ -99,7 +99,7 @@ public class ResponseEntityResultHandler extends AbstractMessageConverterResultH @Override public Mono handleResult(ServerWebExchange exchange, HandlerResult result) { - ResolvableType returnType = result.getReturnValueType(); + ResolvableType returnType = result.getReturnType(); Mono returnValueMono; ResolvableType bodyType; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java index bc28fbc543f..2d94119c82d 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java @@ -136,7 +136,7 @@ public class ViewResolutionResultHandler extends ContentNegotiatingResultHandler @Override public boolean supports(HandlerResult result) { - Class clazz = result.getReturnValueType().getRawClass(); + Class clazz = result.getReturnType().getRawClass(); if (hasModelAttributeAnnotation(result)) { return true; } @@ -144,7 +144,7 @@ public class ViewResolutionResultHandler extends ContentNegotiatingResultHandler return true; } if (getConversionService().canConvert(clazz, Mono.class)) { - clazz = result.getReturnValueType().getGeneric(0).getRawClass(); + clazz = result.getReturnType().getGeneric(0).getRawClass(); return isSupportedType(clazz); } return false; @@ -171,7 +171,7 @@ public class ViewResolutionResultHandler extends ContentNegotiatingResultHandler Mono valueMono; ResolvableType elementType; - ResolvableType returnType = result.getReturnValueType(); + ResolvableType returnType = result.getReturnType(); if (getConversionService().canConvert(returnType.getRawClass(), Mono.class)) { Optional optionalValue = result.getReturnValue();