Rename field in HandlerResult

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;
 	}
+
 }

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);
 	}
 

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

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<MediaType> requestedMediaTypes = getAcceptableMediaTypes(request);
 		List<MediaType> producibleMediaTypes = getProducibleMediaTypes(returnType);