From 54ce20a5e04275835b40f2cd1453db778264191e Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 13 Nov 2015 17:23:00 -0500 Subject: [PATCH] Rename field in HandlerResult --- .../reactive/web/dispatch/HandlerResult.java | 14 +++++++++----- .../web/dispatch/SimpleHandlerResultHandler.java | 2 +- .../web/dispatch/handler/HttpHandlerAdapter.java | 3 ++- .../annotation/ResponseBodyResultHandler.java | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResult.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResult.java index 429d688d2a8..7fa18753a46 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResult.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResult.java @@ -17,6 +17,7 @@ package org.springframework.reactive.web.dispatch; import org.springframework.core.ResolvableType; +import org.springframework.util.Assert; /** * Represent the result of the invocation of an handler. @@ -29,13 +30,15 @@ public class HandlerResult { private final Object value; - private final ResolvableType type; + private final ResolvableType valueType; - public HandlerResult(Object handler, Object value, ResolvableType type) { + public HandlerResult(Object handler, Object value, ResolvableType valueType) { + Assert.notNull(handler, "'handler' is required"); + Assert.notNull(handler, "'valueType' is required"); this.handler = handler; this.value = value; - this.type = type; + this.valueType = valueType; } @@ -47,7 +50,8 @@ public class HandlerResult { return this.value; } - public ResolvableType getType() { - return type; + public ResolvableType getValueType() { + return this.valueType; } + } diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandler.java index e5dfd544ee3..86e130f0dbb 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandler.java @@ -49,7 +49,7 @@ public class SimpleHandlerResultHandler implements Ordered, HandlerResultHandler @Override public boolean supports(HandlerResult result) { - ResolvableType type = result.getType(); + ResolvableType type = result.getValueType(); return type != null && PUBLISHER_VOID.isAssignableFrom(type); } diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/HttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/HttpHandlerAdapter.java index d8190b14282..9e23b256b18 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/HttpHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/HttpHandlerAdapter.java @@ -39,7 +39,8 @@ import org.springframework.reactive.web.http.HttpHandler; */ public class HttpHandlerAdapter implements HandlerAdapter { - private static final ResolvableType PUBLISHER_VOID = ResolvableType.forClassWithGenerics(Publisher.class, Void.class); + private static final ResolvableType PUBLISHER_VOID = ResolvableType.forClassWithGenerics( + Publisher.class, Void.class); @Override diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java index a2d683d7ae1..df6d3e764f8 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java @@ -114,7 +114,7 @@ public class ResponseBodyResultHandler implements HandlerResultHandler, Ordered return Publishers.empty(); } - ResolvableType returnType = result.getType(); + ResolvableType returnType = result.getValueType(); List requestedMediaTypes = getAcceptableMediaTypes(request); List producibleMediaTypes = getProducibleMediaTypes(returnType);