From 318092cfd04023e3fefea268d7031d28aa90a615 Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Thu, 7 Jan 2016 15:58:46 +0100
Subject: [PATCH] Use Mono#defaultIfEmpty instead of Flux#defaultIfEmpty

---
 .../web/reactive/method/InvocableHandlerMethod.java            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java
index a1c3babd4a..116036fd67 100644
--- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java
+++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java
@@ -132,8 +132,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
 							.orElseThrow(() -> getArgError("No resolver for ", parameter, null));
 					try {
 						return resolver.resolveArgument(parameter, request)
-								// TODO Add a defaultIfEmpty alias to Mono to avoid conversion to Flux
-								.flux().defaultIfEmpty(NO_VALUE).next()
+								.defaultIfEmpty(NO_VALUE)
 								.otherwise(ex -> Mono.error(getArgError("Error resolving ", parameter, ex)));
 					}
 					catch (Exception ex) {