From fc1b2e96f791cf0536109a823c12594dad506e3c Mon Sep 17 00:00:00 2001 From: Stephane Maldini Date: Sun, 28 Feb 2016 00:56:10 +0000 Subject: [PATCH] Introduce Mono#justOrEmpty(T) --- .../method/annotation/RequestParamArgumentResolver.java | 3 +-- .../web/reactive/view/ViewResolverResultHandlerTests.java | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java index 0d0dff9b2a3..8eceba031f7 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java @@ -46,8 +46,7 @@ public class RequestParamArgumentResolver implements HandlerMethodArgumentResolv RequestParam annotation = param.getParameterAnnotation(RequestParam.class); String name = (annotation.value().length() != 0 ? annotation.value() : param.getParameterName()); UriComponents uriComponents = UriComponentsBuilder.fromUri(exchange.getRequest().getURI()).build(); - String value = uriComponents.getQueryParams().getFirst(name); - return (value != null ? Mono.just(value) : Mono.empty()); + return Mono.justOrEmpty(uriComponents.getQueryParams().getFirst(name)); } } diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/view/ViewResolverResultHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/view/ViewResolverResultHandlerTests.java index 36a787e3497..0780ce5f350 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/view/ViewResolverResultHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/view/ViewResolverResultHandlerTests.java @@ -57,10 +57,7 @@ import org.springframework.web.server.session.DefaultWebSessionManager; import org.springframework.web.server.session.WebSessionManager; import static org.hamcrest.CoreMatchers.endsWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import static org.mockito.Mockito.mock; @@ -226,7 +223,7 @@ public class ViewResolverResultHandlerTests { @Override public Mono resolveViewName(String viewName, Locale locale) { View view = this.views.get(viewName); - return (view != null ? Mono.just(view) : Mono.empty()); + return Mono.justOrEmpty(view); } }