Rename Mono#otherwise[Empty] to switch[onError/IfEmpty]

sdeleuze · sdeleuze · commit e3fae2716e9d · 2017-04-13T15:36:34.000+02:00
Issue: SPR-15318
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java
@@ -57,7 +57,7 @@ public Mono<Void> apply(HttpServerRequest request, HttpServerResponse response)
 		ReactorServerHttpResponse resp = new ReactorServerHttpResponse(response, bufferFactory);
 
 		return this.httpHandler.handle(req, resp)
-				.otherwise(ex -> {
+				.switchOnError(ex -> {
 					logger.error("Could not complete request", ex);
 					response.status(HttpResponseStatus.INTERNAL_SERVER_ERROR);
 					return Mono.empty();
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java
@@ -66,7 +66,7 @@ public Observable<Void> handle(HttpServerRequest<ByteBuf> nativeRequest,
 		RxNettyServerHttpResponse response = new RxNettyServerHttpResponse(nativeResponse, bufferFactory);
 
 		Publisher<Void> result = this.httpHandler.handle(request, response)
-				.otherwise(ex -> {
+				.switchOnError(ex -> {
 					logger.error("Could not complete request", ex);
 					nativeResponse.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
 					return Mono.empty();
diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java b/spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java
@@ -106,7 +106,7 @@ private static Mono<MultiValueMap<String, String>> initFormData(ServerHttpReques
 			if (MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(contentType)) {
 				return FORM_READER
 						.readMono(FORM_DATA_VALUE_TYPE, request, Collections.emptyMap())
-						.otherwiseIfEmpty(EMPTY_FORM_DATA)
+						.switchIfEmpty(EMPTY_FORM_DATA)
 						.cache();
 			}
 		}
diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java b/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java
@@ -76,7 +76,7 @@ public WebSessionManager getSessionManager() {
 	public Mono<Void> handle(ServerHttpRequest request, ServerHttpResponse response) {
 		ServerWebExchange exchange = createExchange(request, response);
 		return getDelegate().handle(exchange)
-				.otherwise(ex -> {
+				.switchOnError(ex -> {
 					if (logger.isDebugEnabled()) {
 						logger.debug("Could not complete request", ex);
 					}
diff --git a/spring-web/src/main/java/org/springframework/web/server/handler/ExceptionHandlingWebHandler.java b/spring-web/src/main/java/org/springframework/web/server/handler/ExceptionHandlingWebHandler.java
@@ -99,7 +99,7 @@ public Mono<Void> handle(ServerWebExchange exchange) {
 		}
 
 		for (WebExceptionHandler handler : this.exceptionHandlers) {
-			completion = completion.otherwise(ex -> handler.handle(exchange, ex));
+			completion = completion.switchOnError(ex -> handler.handle(exchange, ex));
 		}
 
 		return completion;
diff --git a/spring-web/src/main/java/org/springframework/web/server/session/DefaultWebSessionManager.java b/spring-web/src/main/java/org/springframework/web/server/session/DefaultWebSessionManager.java
@@ -105,7 +105,7 @@ public Mono<WebSession> getSession(ServerWebExchange exchange) {
 						.concatMap(this.sessionStore::retrieveSession)
 						.next()
 						.flatMap(session -> validateSession(exchange, session))
-						.otherwiseIfEmpty(createSession(exchange))
+						.switchIfEmpty(createSession(exchange))
 						.map(session -> extendSession(exchange, session)));
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpResponseTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpResponseTests.java
@@ -96,7 +96,7 @@ public void writeAndFlushWithFluxOfDefaultDataBuffer() throws Exception {
 	public void writeWithError() throws Exception {
 		TestServerHttpResponse response = new TestServerHttpResponse();
 		IllegalStateException error = new IllegalStateException("boo");
-		response.writeWith(Flux.error(error)).otherwise(ex -> Mono.empty()).block();
+		response.writeWith(Flux.error(error)).switchOnError(ex -> Mono.empty()).block();
 
 		assertFalse(response.statusCodeWritten);
 		assertFalse(response.headersWritten);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/DispatcherHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/DispatcherHandler.java
@@ -125,7 +125,7 @@ public Mono<Void> handle(ServerWebExchange exchange) {
 		return Flux.fromIterable(this.handlerMappings)
 				.concatMap(mapping -> mapping.getHandler(exchange))
 				.next()
-				.otherwiseIfEmpty(Mono.error(HANDLER_NOT_FOUND_EXCEPTION))
+				.switchIfEmpty(Mono.error(HANDLER_NOT_FOUND_EXCEPTION))
 				.flatMap(handler -> invokeHandler(exchange, handler))
 				.flatMap(result -> handleResult(exchange, result));
 	}
@@ -141,7 +141,7 @@ private Mono<HandlerResult> invokeHandler(ServerWebExchange exchange, Object han
 
 	private Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result) {
 		return getResultHandler(result).handleResult(exchange, result)
-				.otherwise(ex -> result.applyExceptionHandler(ex).flatMap(exceptionResult ->
+				.switchOnError(ex -> result.applyExceptionHandler(ex).flatMap(exceptionResult ->
 						getResultHandler(exceptionResult).handleResult(exchange, exceptionResult)));
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseBuilder.java
@@ -168,7 +168,7 @@ public Mono<Void> writeTo(ServerWebExchange exchange, HandlerStrategies strategi
 			return Flux.fromStream(viewResolverStream)
 					.concatMap(viewResolver -> viewResolver.resolveViewName(name(), locale))
 					.next()
-					.otherwiseIfEmpty(Mono.error(new IllegalArgumentException("Could not resolve view with name '" +
+					.switchIfEmpty(Mono.error(new IllegalArgumentException("Could not resolve view with name '" +
 							name() +"'")))
 					.flatMap(view -> view.render(model(), contentType, exchange));
 		}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunction.java
@@ -48,7 +48,7 @@ public interface RouterFunction<T extends ServerResponse> {
 	 */
 	default RouterFunction<T> and(RouterFunction<T> other) {
 		return request -> this.route(request)
-				.otherwiseIfEmpty(Mono.defer(() -> other.route(request)));
+				.switchIfEmpty(Mono.defer(() -> other.route(request)));
 	}
 
 	/**
@@ -63,7 +63,7 @@ default RouterFunction<T> and(RouterFunction<T> other) {
 	default RouterFunction<?> andOther(RouterFunction<?> other) {
 		return request -> this.route(request)
 				.map(RouterFunctions::cast)
-				.otherwiseIfEmpty(
+				.switchIfEmpty(
 						Mono.defer(() -> other.route(request).map(RouterFunctions::cast)));
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
@@ -234,7 +234,7 @@ public static HttpWebHandlerAdapter toHttpHandler(RouterFunction<?> routerFuncti
 					.defaultIfEmpty(notFound())
 					.flatMap(handlerFunction -> wrapException(() -> handlerFunction.handle(request)))
 					.flatMap(response -> wrapException(() -> response.writeTo(exchange, strategies)))
-					.otherwise(ResponseStatusException.class,
+					.switchOnError(ResponseStatusException.class,
 							ex -> {
 								exchange.getResponse().setStatusCode(ex.getStatus());
 								if (ex.getMessage() != null) {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
@@ -276,7 +276,7 @@ protected PathExtensionContentTypeResolver initContentNegotiationStrategy() {
 	public Mono<Void> handle(ServerWebExchange exchange) {
 
 		return getResource(exchange)
-				.otherwiseIfEmpty(Mono.defer(() -> {
+				.switchIfEmpty(Mono.defer(() -> {
 					logger.trace("No matching resource found - returning 404");
 					exchange.getResponse().setStatusCode(HttpStatus.NOT_FOUND);
 					return Mono.empty();
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java
@@ -159,7 +159,7 @@ protected Mono<Resource> resolveResourceInternal(ServerWebExchange exchange, Str
 			List<? extends Resource> locations, ResourceResolverChain chain) {
 
 		return chain.resolveResource(exchange, requestPath, locations)
-				.otherwiseIfEmpty(Mono.defer(() ->
+				.switchIfEmpty(Mono.defer(() ->
 						resolveVersionedResource(exchange, requestPath, locations, chain)));
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java
@@ -75,7 +75,7 @@ protected Mono<Resource> resolveResourceInternal(ServerWebExchange exchange, Str
 			List<? extends Resource> locations, ResourceResolverChain chain) {
 
 		return chain.resolveResource(exchange, requestPath, locations)
-				.otherwiseIfEmpty(Mono.defer(() -> {
+				.switchIfEmpty(Mono.defer(() -> {
 					String webJarsResourcePath = findWebJarResourcePath(requestPath);
 					if (webJarsResourcePath != null) {
 						return chain.resolveResource(exchange, webJarsResourcePath, locations);
@@ -91,7 +91,7 @@ protected Mono<String> resolveUrlPathInternal(String resourceUrlPath,
 			List<? extends Resource> locations, ResourceResolverChain chain) {
 
 		return chain.resolveUrlPath(resourceUrlPath, locations)
-				.otherwiseIfEmpty(Mono.defer(() -> {
+				.switchIfEmpty(Mono.defer(() -> {
 					String webJarResourcePath = findWebJarResourcePath(resourceUrlPath);
 					if (webJarResourcePath != null) {
 						return chain.resolveUrlPath(webJarResourcePath, locations);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
@@ -130,9 +130,9 @@ protected Mono<Object> readBody(MethodParameter bodyParameter, boolean isBodyReq
 				}
 				else {
 					Mono<?> mono = reader.readMono(bodyType, elementType, request, response, readHints);
-					mono = mono.otherwise(ex -> Mono.error(getReadError(bodyParameter, ex)));
+					mono = mono.switchOnError(ex -> Mono.error(getReadError(bodyParameter, ex)));
 					if (isBodyRequired || (adapter != null && !adapter.supportsEmpty())) {
-						mono = mono.otherwiseIfEmpty(Mono.error(getRequiredBodyError(bodyParameter)));
+						mono = mono.switchIfEmpty(Mono.error(getRequiredBodyError(bodyParameter)));
 					}
 					Object[] hints = extractValidationHints(bodyParameter);
 					if (hints != null) {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java
@@ -103,7 +103,7 @@ public Mono<Object> resolveArgument(
 					handleResolvedValue(arg, namedValueInfo.name, parameter, model, exchange);
 					return arg;
 				})
-				.otherwiseIfEmpty(getDefaultValue(
+				.switchIfEmpty(getDefaultValue(
 						namedValueInfo, parameter, bindingContext, model, exchange));
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java
@@ -189,7 +189,7 @@ public Mono<HandlerResult> handle(ServerWebExchange exchange, Object handler) {
 				.then(() -> this.methodResolver.getRequestMappingMethod(handlerMethod)
 						.invoke(exchange, bindingContext)
 						.doOnNext(result -> result.setExceptionHandler(exceptionHandler))
-						.otherwise(exceptionHandler));
+						.switchOnError(exceptionHandler));
 	}
 
 	private Mono<HandlerResult> handleException(Throwable ex, HandlerMethod handlerMethod,
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java
@@ -193,7 +193,7 @@ public Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result)
 		}
 
 		return valueMono
-				.otherwiseIfEmpty(exchange.isNotModified() ? Mono.empty() : NO_VALUE_MONO)
+				.switchIfEmpty(exchange.isNotModified() ? Mono.empty() : NO_VALUE_MONO)
 				.flatMap(returnValue -> {
 
 					Mono<List<View>> viewsMono;
diff --git a/src/docs/asciidoc/web/web-flux-functional.adoc b/src/docs/asciidoc/web/web-flux-functional.adoc
@@ -95,7 +95,7 @@ public class PersonHandler {
 		Mono<Person> personMono = this.repository.getPerson(personId);
 		return personMono
 				.then(person -> ServerResponse.ok().contentType(APPLICATION_JSON).body(fromObject(person)))
-				.otherwiseIfEmpty(notFound);
+				.switchIfEmpty(notFound);
 	}
 }
 ----

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ private static Mono<MultiValueMap<String, String>> initFormData(ServerHttpReques`
`106`	`106`	`if (MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(contentType)) {`
`107`	`107`	`return FORM_READER`
`108`	`108`	`.readMono(FORM_DATA_VALUE_TYPE, request, Collections.emptyMap())`
`109`		`- .otherwiseIfEmpty(EMPTY_FORM_DATA)`
	`109`	`+ .switchIfEmpty(EMPTY_FORM_DATA)`
`110`	`110`	`.cache();`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public WebSessionManager getSessionManager() {`
`76`	`76`	`public Mono<Void> handle(ServerHttpRequest request, ServerHttpResponse response) {`
`77`	`77`	`ServerWebExchange exchange = createExchange(request, response);`
`78`	`78`	`return getDelegate().handle(exchange)`
`79`		`- .otherwise(ex -> {`
	`79`	`+ .switchOnError(ex -> {`
`80`	`80`	`if (logger.isDebugEnabled()) {`
`81`	`81`	`logger.debug("Could not complete request", ex);`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public Mono<Void> handle(ServerWebExchange exchange) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`for (WebExceptionHandler handler : this.exceptionHandlers) {`
`102`		`- completion = completion.otherwise(ex -> handler.handle(exchange, ex));`
	`102`	`+ completion = completion.switchOnError(ex -> handler.handle(exchange, ex));`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`return completion;`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public Mono<WebSession> getSession(ServerWebExchange exchange) {`
`105`	`105`	`.concatMap(this.sessionStore::retrieveSession)`
`106`	`106`	`.next()`
`107`	`107`	`.flatMap(session -> validateSession(exchange, session))`
`108`		`- .otherwiseIfEmpty(createSession(exchange))`
	`108`	`+ .switchIfEmpty(createSession(exchange))`
`109`	`109`	`.map(session -> extendSession(exchange, session)));`
`110`	`110`	`}`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public Mono<Void> writeTo(ServerWebExchange exchange, HandlerStrategies strategi`
`168`	`168`	`return Flux.fromStream(viewResolverStream)`
`169`	`169`	`.concatMap(viewResolver -> viewResolver.resolveViewName(name(), locale))`
`170`	`170`	`.next()`
`171`		`- .otherwiseIfEmpty(Mono.error(new IllegalArgumentException("Could not resolve view with name '" +`
	`171`	`+ .switchIfEmpty(Mono.error(new IllegalArgumentException("Could not resolve view with name '" +`
`172`	`172`	`name() +"'")))`
`173`	`173`	`.flatMap(view -> view.render(model(), contentType, exchange));`
`174`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ protected Mono<Resource> resolveResourceInternal(ServerWebExchange exchange, Str`
`159`	`159`	`List<? extends Resource> locations, ResourceResolverChain chain) {`
`160`	`160`
`161`	`161`	`return chain.resolveResource(exchange, requestPath, locations)`
`162`		`- .otherwiseIfEmpty(Mono.defer(() ->`
	`162`	`+ .switchIfEmpty(Mono.defer(() ->`
`163`	`163`	`resolveVersionedResource(exchange, requestPath, locations, chain)));`
`164`	`164`	`}`
`165`	`165`
Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,9 @@ protected Mono<Object> readBody(MethodParameter bodyParameter, boolean isBodyReq`
`130`	`130`	`}`
`131`	`131`	`else {`
`132`	`132`	`Mono<?> mono = reader.readMono(bodyType, elementType, request, response, readHints);`
`133`		`- mono = mono.otherwise(ex -> Mono.error(getReadError(bodyParameter, ex)));`
	`133`	`+ mono = mono.switchOnError(ex -> Mono.error(getReadError(bodyParameter, ex)));`
`134`	`134`	`if (isBodyRequired \|\| (adapter != null && !adapter.supportsEmpty())) {`
`135`		`- mono = mono.otherwiseIfEmpty(Mono.error(getRequiredBodyError(bodyParameter)));`
	`135`	`+ mono = mono.switchIfEmpty(Mono.error(getRequiredBodyError(bodyParameter)));`
`136`	`136`	`}`
`137`	`137`	`Object[] hints = extractValidationHints(bodyParameter);`
`138`	`138`	`if (hints != null) {`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public Mono<Object> resolveArgument(`
`103`	`103`	`handleResolvedValue(arg, namedValueInfo.name, parameter, model, exchange);`
`104`	`104`	`return arg;`
`105`	`105`	`})`
`106`		`- .otherwiseIfEmpty(getDefaultValue(`
	`106`	`+ .switchIfEmpty(getDefaultValue(`
`107`	`107`	`namedValueInfo, parameter, bindingContext, model, exchange));`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public Mono<HandlerResult> handle(ServerWebExchange exchange, Object handler) {`
`189`	`189`	`.then(() -> this.methodResolver.getRequestMappingMethod(handlerMethod)`
`190`	`190`	`.invoke(exchange, bindingContext)`
`191`	`191`	`.doOnNext(result -> result.setExceptionHandler(exceptionHandler))`
`192`		`- .otherwise(exceptionHandler));`
	`192`	`+ .switchOnError(exceptionHandler));`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`private Mono<HandlerResult> handleException(Throwable ex, HandlerMethod handlerMethod,`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result)`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`return valueMono`
`196`		`- .otherwiseIfEmpty(exchange.isNotModified() ? Mono.empty() : NO_VALUE_MONO)`
	`196`	`+ .switchIfEmpty(exchange.isNotModified() ? Mono.empty() : NO_VALUE_MONO)`
`197`	`197`	`.flatMap(returnValue -> {`
`198`	`198`
`199`	`199`	`Mono<List<View>> viewsMono;`