Add a ResolvableType field to HandlerResult

This change allows to be able to check generic type on the return value
at HandlerAdapter and ResultHandler level. For example, it allows to do
a Publisher<Void> check in SimpleHandlerResultHandler.

spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResult.java

@@ -16,6 +16,7 @@
 
 package org.springframework.reactive.web.dispatch;
 
+import org.springframework.core.ResolvableType;
 
 /**
  * Represent the result of the invocation of an handler.
@@ -28,10 +29,13 @@ public class HandlerResult {
 
 	private final Object value;
 
+	private final ResolvableType type;
 
-	public HandlerResult(Object handler, Object value) {
+
+	public HandlerResult(Object handler, Object value, ResolvableType type) {
 		this.handler = handler;
 		this.value = value;
+		this.type = type;
 	}
 
 
@@ -43,4 +47,7 @@ public class HandlerResult {
 		return this.value;
 	}
 
+	public ResolvableType getType() {
+		return type;
+	}
 }

spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandler.java

@@ -22,6 +22,7 @@ import org.reactivestreams.Publisher;
 import reactor.Publishers;
 
 import org.springframework.core.Ordered;
+import org.springframework.core.ResolvableType;
 import org.springframework.http.server.ReactiveServerHttpRequest;
 import org.springframework.http.server.ReactiveServerHttpResponse;
 
@@ -32,6 +33,8 @@ import org.springframework.http.server.ReactiveServerHttpResponse;
  */
 public class SimpleHandlerResultHandler implements Ordered, HandlerResultHandler {
 
+	private static final ResolvableType PUBLISHER_VOID = ResolvableType.forClassWithGenerics(Publisher.class, Void.class);
+
 	private int order = Ordered.LOWEST_PRECEDENCE;
 
 
@@ -46,8 +49,8 @@ public class SimpleHandlerResultHandler implements Ordered, HandlerResultHandler
 
 	@Override
 	public boolean supports(HandlerResult result) {
-		Object value = result.getValue();
+		ResolvableType type = result.getType();
-		return value != null && Publisher.class.isAssignableFrom(value.getClass());
+		return type != null && PUBLISHER_VOID.isAssignableFrom(type);
 	}
 
 	@Override

spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/HttpHandlerAdapter.java

@@ -19,6 +19,7 @@ package org.springframework.reactive.web.dispatch.handler;
 import org.reactivestreams.Publisher;
 import reactor.Publishers;
 
+import org.springframework.core.ResolvableType;
 import org.springframework.http.server.ReactiveServerHttpRequest;
 import org.springframework.http.server.ReactiveServerHttpResponse;
 import org.springframework.reactive.web.dispatch.HandlerAdapter;
@@ -38,6 +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);
+
 
 	@Override
 	public boolean supports(Object handler) {
@@ -50,7 +53,7 @@ public class HttpHandlerAdapter implements HandlerAdapter {
 
 		HttpHandler httpHandler = (HttpHandler)handler;
 		Publisher<Void> completion = httpHandler.handle(request, response);
-		return Publishers.just(new HandlerResult(httpHandler, completion));
+		return Publishers.just(new HandlerResult(httpHandler, completion, PUBLISHER_VOID));
 	}
 
 }

spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerAdapter.java

@@ -24,6 +24,7 @@ import org.reactivestreams.Publisher;
 import reactor.Publishers;
 
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.ResolvableType;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.http.server.ReactiveServerHttpRequest;
 import org.springframework.http.server.ReactiveServerHttpResponse;
@@ -91,9 +92,10 @@ public class RequestMappingHandlerAdapter implements HandlerAdapter, Initializin
 
 		InvocableHandlerMethod handlerMethod = new InvocableHandlerMethod((HandlerMethod) handler);
 		handlerMethod.setHandlerMethodArgumentResolvers(this.argumentResolvers);
+		ResolvableType type =  ResolvableType.forMethodParameter(handlerMethod.getReturnType());
 
 		Publisher<Object> resultPublisher = handlerMethod.invokeForRequest(request);
-		return Publishers.map(resultPublisher, result -> new HandlerResult(handlerMethod, result));
+		return Publishers.map(resultPublisher, result -> new HandlerResult(handlerMethod, result, type));
 	}
 
 }

spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java

@@ -114,8 +114,7 @@ public class ResponseBodyResultHandler implements HandlerResultHandler, Ordered
 			return Publishers.empty();
 		}
 
-		HandlerMethod hm = (HandlerMethod) result.getHandler();
+		ResolvableType returnType = result.getType();
-		ResolvableType returnType = ResolvableType.forMethodParameter(hm.getReturnValueType(value));
 
 		List<MediaType> requestedMediaTypes = getAcceptableMediaTypes(request);
 		List<MediaType> producibleMediaTypes = getProducibleMediaTypes(returnType);

spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandlerTests.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2002-2015 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.reactive.web.dispatch;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.reactivestreams.Publisher;
+
+import org.springframework.core.ResolvableType;
+import org.springframework.web.method.HandlerMethod;
+
+/**
+ * @author Sebastien Deleuze
+ */
+public class SimpleHandlerResultHandlerTests {
+
+	@Test
+	public void supports() throws NoSuchMethodException {
+
+		SimpleHandlerResultHandler resultHandler = new SimpleHandlerResultHandler();
+		TestController controller = new TestController();
+
+		HandlerMethod hm = new HandlerMethod(controller, TestController.class.getMethod("voidReturnValue"));
+		ResolvableType type = ResolvableType.forMethodParameter(hm.getReturnType());
+		assertFalse(resultHandler.supports(new HandlerResult(hm, null, type)));
+
+		hm = new HandlerMethod(controller, TestController.class.getMethod("publisherString"));
+		type = ResolvableType.forMethodParameter(hm.getReturnType());
+		assertFalse(resultHandler.supports(new HandlerResult(hm, null, type)));
+
+		hm = new HandlerMethod(controller, TestController.class.getMethod("publisherVoid"));
+		type = ResolvableType.forMethodParameter(hm.getReturnType());
+		assertTrue(resultHandler.supports(new HandlerResult(hm, null, type)));
+	}
+
+
+	@SuppressWarnings("unused")
+	private static class TestController {
+
+		public Publisher<String> voidReturnValue() {
+			return null;
+		}
+
+		public Publisher<String> publisherString() {
+			return null;
+		}
+
+		public Publisher<Void> publisherVoid() {
+			return null;
+		}
+	}
+
+}

spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandlerTests.java

@@ -21,6 +21,7 @@ import java.util.Collections;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
+import org.springframework.core.ResolvableType;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.reactive.codec.encoder.StringEncoder;
 import org.springframework.reactive.web.dispatch.HandlerResult;
@@ -43,13 +44,16 @@ public class ResponseBodyResultHandlerTests {
 		TestController controller = new TestController();
 
 		HandlerMethod hm = new HandlerMethod(controller,TestController.class.getMethod("notAnnotated"));
-		assertFalse(handler.supports(new HandlerResult(hm, null)));
+		ResolvableType type = ResolvableType.forMethodParameter(hm.getReturnType());
+		assertFalse(handler.supports(new HandlerResult(hm, null, type)));
 
 		hm = new HandlerMethod(controller, TestController.class.getMethod("publisherString"));
-		assertTrue(handler.supports(new HandlerResult(hm, null)));
+		type = ResolvableType.forMethodParameter(hm.getReturnType());
+		assertTrue(handler.supports(new HandlerResult(hm, null, type)));
 
 		hm = new HandlerMethod(controller, TestController.class.getMethod("publisherVoid"));
-		assertTrue(handler.supports(new HandlerResult(hm, null)));
+		type = ResolvableType.forMethodParameter(hm.getReturnType());
+		assertTrue(handler.supports(new HandlerResult(hm, null, type)));
 	}