root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Rename HandlerResult fields from value to result

This commit is contained in:
Rossen Stoyanchev 2015-12-28 10:11:55 -05:00
parent 84e3ad342b
commit 9789db23d2
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java
View File

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

20
spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java
View File

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

6
spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java
View File

@ -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<Void> 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<Void> completion = (value instanceof Publisher ? (Publisher<Void>)value : this.conversionService.convert(value, Publisher.class));

4
spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java
View File

@ -130,14 +130,14 @@ public class ResponseBodyResultHandler implements HandlerResultHandler, Ordered
public Publisher<Void> 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);

8
spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java
View File

@ -64,7 +64,7 @@ public class InvocableHandlerMethodTests {
List<HandlerResult> 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<HandlerResult> 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<HandlerResult> 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<HandlerResult> 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