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

Introduce Mono#justOrEmpty(T)

This commit is contained in:
Stephane Maldini 2016-02-28 00:56:10 +00:00
parent 999dfe3925
commit fc1b2e96f7
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java
View File

@ -46,8 +46,7 @@ public class RequestParamArgumentResolver implements HandlerMethodArgumentResolv
RequestParam annotation = param.getParameterAnnotation(RequestParam.class); RequestParam annotation = param.getParameterAnnotation(RequestParam.class);
String name = (annotation.value().length() != 0 ? annotation.value() : param.getParameterName()); String name = (annotation.value().length() != 0 ? annotation.value() : param.getParameterName());
UriComponents uriComponents = UriComponentsBuilder.fromUri(exchange.getRequest().getURI()).build(); UriComponents uriComponents = UriComponentsBuilder.fromUri(exchange.getRequest().getURI()).build();
String value = uriComponents.getQueryParams().getFirst(name); return Mono.justOrEmpty(uriComponents.getQueryParams().getFirst(name));
return (value != null ? Mono.just(value) : Mono.empty());
} }
} }

7
spring-web-reactive/src/test/java/org/springframework/web/reactive/view/ViewResolverResultHandlerTests.java
View File

@ -57,10 +57,7 @@ import org.springframework.web.server.session.DefaultWebSessionManager;
import org.springframework.web.server.session.WebSessionManager; import org.springframework.web.server.session.WebSessionManager;
import static org.hamcrest.CoreMatchers.endsWith; import static org.hamcrest.CoreMatchers.endsWith;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.*;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@ -226,7 +223,7 @@ public class ViewResolverResultHandlerTests {
@Override @Override
public Mono<View> resolveViewName(String viewName, Locale locale) { public Mono<View> resolveViewName(String viewName, Locale locale) {
View view = this.views.get(viewName); View view = this.views.get(viewName);
return (view != null ? Mono.just(view) : Mono.empty()); return Mono.justOrEmpty(view);
} }
} }