提交 9789db23 编写于 作者: R Rossen Stoyanchev

Rename HandlerResult fields from value to result

上级 84e3ad34
...@@ -151,7 +151,7 @@ public class DispatcherHandler implements HttpHandler, ApplicationContextAware { ...@@ -151,7 +151,7 @@ public class DispatcherHandler implements HttpHandler, ApplicationContextAware {
return resultHandler; return resultHandler;
} }
} }
throw new IllegalStateException("No HandlerResultHandler for " + handlerResult.getValue()); throw new IllegalStateException("No HandlerResultHandler for " + handlerResult.getResult());
} }
......
...@@ -28,17 +28,17 @@ public class HandlerResult { ...@@ -28,17 +28,17 @@ public class HandlerResult {
private final Object handler; 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, "'handler' is required");
Assert.notNull(handler, "'valueType' is required"); Assert.notNull(handler, "'resultType' is required");
this.handler = handler; this.handler = handler;
this.value = value; this.result = result;
this.valueType = valueType; this.resultType = resultType;
} }
...@@ -46,12 +46,12 @@ public class HandlerResult { ...@@ -46,12 +46,12 @@ public class HandlerResult {
return this.handler; return this.handler;
} }
public Object getValue() { public Object getResult() {
return this.value; return this.result;
} }
public ResolvableType getValueType() { public ResolvableType getResultType() {
return this.valueType; return this.resultType;
} }
} }
...@@ -64,7 +64,7 @@ public class SimpleHandlerResultHandler implements Ordered, HandlerResultHandler ...@@ -64,7 +64,7 @@ public class SimpleHandlerResultHandler implements Ordered, HandlerResultHandler
@Override @Override
public boolean supports(HandlerResult result) { public boolean supports(HandlerResult result) {
ResolvableType type = result.getValueType(); ResolvableType type = result.getResultType();
return type != null && Void.TYPE.equals(type.getRawClass()) || return type != null && Void.TYPE.equals(type.getRawClass()) ||
(Void.class.isAssignableFrom(type.getGeneric(0).getRawClass()) && isConvertibleToPublisher(type)); (Void.class.isAssignableFrom(type.getGeneric(0).getRawClass()) && isConvertibleToPublisher(type));
} }
...@@ -78,8 +78,8 @@ public class SimpleHandlerResultHandler implements Ordered, HandlerResultHandler ...@@ -78,8 +78,8 @@ public class SimpleHandlerResultHandler implements Ordered, HandlerResultHandler
public Publisher<Void> handleResult(ServerHttpRequest request, public Publisher<Void> handleResult(ServerHttpRequest request,
ServerHttpResponse response, HandlerResult result) { ServerHttpResponse response, HandlerResult result) {
Object value = result.getValue(); Object value = result.getResult();
if (Void.TYPE.equals(result.getValueType().getRawClass())) { if (Void.TYPE.equals(result.getResultType().getRawClass())) {
return response.writeHeaders(); return response.writeHeaders();
} }
Publisher<Void> completion = (value instanceof Publisher ? (Publisher<Void>)value : this.conversionService.convert(value, Publisher.class)); Publisher<Void> completion = (value instanceof Publisher ? (Publisher<Void>)value : this.conversionService.convert(value, Publisher.class));
......
...@@ -130,14 +130,14 @@ public class ResponseBodyResultHandler implements HandlerResultHandler, Ordered ...@@ -130,14 +130,14 @@ public class ResponseBodyResultHandler implements HandlerResultHandler, Ordered
public Publisher<Void> handleResult(ServerHttpRequest request, public Publisher<Void> handleResult(ServerHttpRequest request,
ServerHttpResponse response, HandlerResult result) { ServerHttpResponse response, HandlerResult result) {
Object value = result.getValue(); Object value = result.getResult();
if (value == null) { if (value == null) {
return Publishers.empty(); return Publishers.empty();
} }
Publisher<?> publisher; Publisher<?> publisher;
ResolvableType elementType; ResolvableType elementType;
ResolvableType returnType = result.getValueType(); ResolvableType returnType = result.getResultType();
if (this.conversionService.canConvert(returnType.getRawClass(), Publisher.class)) { if (this.conversionService.canConvert(returnType.getRawClass(), Publisher.class)) {
publisher = this.conversionService.convert(value, Publisher.class); publisher = this.conversionService.convert(value, Publisher.class);
elementType = returnType.getGeneric(0); elementType = returnType.getGeneric(0);
......
...@@ -64,7 +64,7 @@ public class InvocableHandlerMethodTests { ...@@ -64,7 +64,7 @@ public class InvocableHandlerMethodTests {
List<HandlerResult> values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS); List<HandlerResult> values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS);
assertEquals(1, values.size()); assertEquals(1, values.size());
assertEquals("success", values.get(0).getValue()); assertEquals("success", values.get(0).getResult());
} }
@Test @Test
...@@ -77,7 +77,7 @@ public class InvocableHandlerMethodTests { ...@@ -77,7 +77,7 @@ public class InvocableHandlerMethodTests {
List<HandlerResult> values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS); List<HandlerResult> values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS);
assertEquals(1, values.size()); assertEquals(1, values.size());
assertEquals("success:null", values.get(0).getValue()); assertEquals("success:null", values.get(0).getResult());
} }
@Test @Test
...@@ -89,7 +89,7 @@ public class InvocableHandlerMethodTests { ...@@ -89,7 +89,7 @@ public class InvocableHandlerMethodTests {
List<HandlerResult> values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS); List<HandlerResult> values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS);
assertEquals(1, values.size()); assertEquals(1, values.size());
assertEquals("success:value1", values.get(0).getValue()); assertEquals("success:value1", values.get(0).getResult());
} }
@Test @Test
...@@ -101,7 +101,7 @@ public class InvocableHandlerMethodTests { ...@@ -101,7 +101,7 @@ public class InvocableHandlerMethodTests {
List<HandlerResult> values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS); List<HandlerResult> values = Streams.wrap(publisher).toList().await(5, TimeUnit.SECONDS);
assertEquals(1, values.size()); assertEquals(1, values.size());
assertEquals("success:value1", values.get(0).getValue()); assertEquals("success:value1", values.get(0).getResult());
} }
@Test @Test
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册