diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java index 51cefb1ecab..2b654e1564e 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java @@ -151,7 +151,7 @@ public class DispatcherHandler implements HttpHandler, ApplicationContextAware { return resultHandler; } } - throw new IllegalStateException("No HandlerResultHandler for " + handlerResult.getValue()); + throw new IllegalStateException("No HandlerResultHandler for " + handlerResult.getResult()); } 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 b2e921e143f..0dacf869e73 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 @@ -28,17 +28,17 @@ public class HandlerResult { private final Object handler; - private final Object value; + private final Object result; - private final ResolvableType valueType; + private final ResolvableType resultType; - public HandlerResult(Object handler, Object value, ResolvableType valueType) { + public HandlerResult(Object handler, Object result, ResolvableType resultType) { Assert.notNull(handler, "'handler' is required"); - Assert.notNull(handler, "'valueType' is required"); + Assert.notNull(handler, "'resultType' is required"); this.handler = handler; - this.value = value; - this.valueType = valueType; + this.result = result; + this.resultType = resultType; } @@ -46,12 +46,12 @@ public class HandlerResult { return this.handler; } - public Object getValue() { - return this.value; + public Object getResult() { + return this.result; } - public ResolvableType getValueType() { - return this.valueType; + public ResolvableType getResultType() { + return this.resultType; } } diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java index 0721f92d06f..6c7bd02930e 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java @@ -64,7 +64,7 @@ public class SimpleHandlerResultHandler implements Ordered, HandlerResultHandler @Override public boolean supports(HandlerResult result) { - ResolvableType type = result.getValueType(); + ResolvableType type = result.getResultType(); return type != null && Void.TYPE.equals(type.getRawClass()) || (Void.class.isAssignableFrom(type.getGeneric(0).getRawClass()) && isConvertibleToPublisher(type)); } @@ -78,8 +78,8 @@ public class SimpleHandlerResultHandler implements Ordered, HandlerResultHandler public Publisher handleResult(ServerHttpRequest request, ServerHttpResponse response, HandlerResult result) { - Object value = result.getValue(); - if (Void.TYPE.equals(result.getValueType().getRawClass())) { + Object value = result.getResult(); + if (Void.TYPE.equals(result.getResultType().getRawClass())) { return response.writeHeaders(); } Publisher completion = (value instanceof Publisher ? (Publisher)value : this.conversionService.convert(value, Publisher.class)); diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java index d0d4ab63408..e52099f27dd 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java @@ -130,14 +130,14 @@ public class ResponseBodyResultHandler implements HandlerResultHandler, Ordered public Publisher handleResult(ServerHttpRequest request, ServerHttpResponse response, HandlerResult result) { - Object value = result.getValue(); + Object value = result.getResult(); if (value == null) { return Publishers.empty(); } Publisher publisher; ResolvableType elementType; - ResolvableType returnType = result.getValueType(); + ResolvableType returnType = result.getResultType(); if (this.conversionService.canConvert(returnType.getRawClass(), Publisher.class)) { publisher = this.conversionService.convert(value, Publisher.class); elementType = returnType.getGeneric(0); diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java index 5da1f99568c..c7b0bee5fda 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java @@ -64,7 +64,7 @@ public class InvocableHandlerMethodTests { List values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS); assertEquals(1, values.size()); - assertEquals("success", values.get(0).getValue()); + assertEquals("success", values.get(0).getResult()); } @Test @@ -77,7 +77,7 @@ public class InvocableHandlerMethodTests { List values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS); assertEquals(1, values.size()); - assertEquals("success:null", values.get(0).getValue()); + assertEquals("success:null", values.get(0).getResult()); } @Test @@ -89,7 +89,7 @@ public class InvocableHandlerMethodTests { List values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS); assertEquals(1, values.size()); - assertEquals("success:value1", values.get(0).getValue()); + assertEquals("success:value1", values.get(0).getResult()); } @Test @@ -101,7 +101,7 @@ public class InvocableHandlerMethodTests { List values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS); assertEquals(1, values.size()); - assertEquals("success:value1", values.get(0).getValue()); + assertEquals("success:value1", values.get(0).getResult()); } @Test