ResponseStatusExceptionHandler in web.server.handler (plus related polishing)

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

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,9 +84,7 @@ public class DispatcherHandler implements WebHandler, ApplicationContextAware {
 		initStrategies(applicationContext);
 	}
 
-
 	protected void initStrategies(ApplicationContext context) {
-
 		Map<String, HandlerMapping> mappingBeans = BeanFactoryUtils.beansOfTypeIncludingAncestors(
 				context, HandlerMapping.class, true, false);
 
@@ -145,4 +143,4 @@ public class DispatcherHandler implements WebHandler, ApplicationContextAware {
 		throw new IllegalStateException("No HandlerResultHandler for " + handlerResult.getReturnValue());
 	}
 
-}
\ No newline at end of file
+}

spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerAdapter.java

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ public interface HandlerAdapter {
 
 	/**
 	 * Whether this {@code HandlerAdapter} supports the given {@code handler}.
-	 *
 	 * @param handler handler object to check
 	 * @return whether or not the handler is supported
 	 */
@@ -42,17 +41,14 @@ public interface HandlerAdapter {
 
 	/**
 	 * Handle the request with the given handler.
-	 *
 	 * <p>Implementations are encouraged to handle exceptions resulting from the
 	 * invocation of a handler in order and if necessary to return an alternate
 	 * result that represents an error response.
-	 *
 	 * <p>Furthermore since an async {@code HandlerResult} may produce an error
 	 * later during result handling implementations are also encouraged to
 	 * {@link HandlerResult#setExceptionHandler(Function) set an exception
 	 * handler} on the {@code HandlerResult} so that may also be applied later
 	 * after result handling.
-	 *
 	 * @param exchange current server exchange
 	 * @param handler the selected handler which must have been previously
 	 * checked via {@link #supports(Object)}

spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerMapping.java

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,10 +80,11 @@ public interface HandlerMapping {
 	 */
 	String PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE = HandlerMapping.class.getName() + ".producibleMediaTypes";
 
+
 	/**
 	 * Return a handler for this request.
 	 * @param exchange current server exchange
-	 * @return A {@link Mono} that emits one value or none in case the request
+	 * @return a {@link Mono} that emits one value or none in case the request
 	 * cannot be resolved to a handler
 	 */
 	Mono<Object> getHandler(ServerWebExchange exchange);

spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,6 @@ public interface HandlerResultHandler {
 
 	/**
 	 * Whether this handler supports the given {@link HandlerResult}.
-	 *
 	 * @param result result object to check
 	 * @return whether or not this object can use the given result
 	 */
@@ -40,11 +39,10 @@ public interface HandlerResultHandler {
 	/**
 	 * Process the given result modifying response headers and/or writing data
 	 * to the response.
-	 *
 	 * @param exchange current server exchange
 	 * @param result the result from the handling
 	 * @return {@code Mono<Void>} to indicate when request handling is complete.
 	 */
 	Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result);
 
-}
\ No newline at end of file
+}

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/SimpleUrlHandlerMappingIntegrationTests.java

@@ -39,7 +39,7 @@ import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.reactive.DispatcherHandler;
-import org.springframework.web.reactive.ResponseStatusExceptionHandler;
+import org.springframework.web.server.handler.ResponseStatusExceptionHandler;
 import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
 import org.springframework.web.server.WebHandler;
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder;

spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import java.util.Collections;

spring-web/src/main/java/org/springframework/web/server/MethodNotAllowedException.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import java.util.Collection;

spring-web/src/main/java/org/springframework/web/server/NotAcceptableStatusException.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import java.util.Collections;

spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import org.springframework.core.NestedRuntimeException;

spring-web/src/main/java/org/springframework/web/server/ServerErrorException.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import java.util.Optional;

spring-web/src/main/java/org/springframework/web/server/ServerWebExchange.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import java.util.Map;

spring-web/src/main/java/org/springframework/web/server/ServerWebInputException.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import java.util.Optional;

spring-web/src/main/java/org/springframework/web/server/UnsupportedMediaTypeStatusException.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import java.util.Collections;

spring-web/src/main/java/org/springframework/web/server/WebExceptionHandler.java

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import reactor.core.publisher.Mono;
@@ -29,7 +30,6 @@ public interface WebExceptionHandler {
 	 * Handle the given exception. A completion signal through the return value
 	 * indicates error handling is complete while an error signal indicates the
 	 * exception is still not handled.
-	 *
 	 * @param exchange the current exchange
 	 * @param ex the exception to handle
 	 * @return {@code Mono<Void>} to indicate when exception handling is complete

spring-web/src/main/java/org/springframework/web/server/WebFilter.java

@@ -31,7 +31,6 @@ public interface WebFilter {
 	/**
 	 * Process the Web request and (optionally) delegate to the next
 	 * {@code WebFilter} through the given {@link WebFilterChain}.
-	 *
 	 * @param exchange the current server exchange
 	 * @param chain provides a way to delegate to the next filter
 	 * @return {@code Mono<Void>} to indicate when request processing is complete

spring-web/src/main/java/org/springframework/web/server/WebFilterChain.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import reactor.core.publisher.Mono;
@@ -27,7 +28,6 @@ public interface WebFilterChain {
 
 	/**
 	 * Delegate to the next {@code WebFilter} in the chain.
-	 *
 	 * @param exchange the current server exchange
 	 * @return {@code Mono<Void>} to indicate when request handling is complete
 	 */

spring-web/src/main/java/org/springframework/web/server/WebHandler.java

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,6 @@ public interface WebHandler {
 
 	/**
 	 * Handle the web server exchange.
-	 *
 	 * @param exchange the current server exchange
 	 * @return {@code Mono<Void>} to indicate when request handling is complete
 	 */

spring-web/src/main/java/org/springframework/web/server/WebSession.java

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import java.time.Duration;

spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server.adapter;
 
 import java.util.Map;
@@ -48,9 +49,9 @@ public class DefaultServerWebExchange implements ServerWebExchange {
 	public DefaultServerWebExchange(ServerHttpRequest request, ServerHttpResponse response,
 			WebSessionManager sessionManager) {
 
-		Assert.notNull(request, "'request' is required.");
-		Assert.notNull(response, "'response' is required.");
-		Assert.notNull(response, "'sessionManager' is required.");
+		Assert.notNull(request, "'request' is required");
+		Assert.notNull(response, "'response' is required");
+		Assert.notNull(response, "'sessionManager' is required");
 		this.request = request;
 		this.response = response;
 		this.sessionMono = sessionManager.getSession(this).cache();

spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server.adapter;
 
 import org.apache.commons.logging.Log;
@@ -24,9 +25,9 @@ import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.util.Assert;
+import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebHandler;
 import org.springframework.web.server.handler.WebHandlerDecorator;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.session.DefaultWebSessionManager;
 import org.springframework.web.server.session.WebSessionManager;
 
@@ -43,7 +44,6 @@ public class HttpWebHandlerAdapter extends WebHandlerDecorator implements HttpHa
 
 	private static Log logger = LogFactory.getLog(HttpWebHandlerAdapter.class);
 
-
 	private WebSessionManager sessionManager = new DefaultWebSessionManager();
 
 
@@ -60,7 +60,7 @@ public class HttpWebHandlerAdapter extends WebHandlerDecorator implements HttpHa
 	 * @param sessionManager the session manager to use
 	 */
 	public void setSessionManager(WebSessionManager sessionManager) {
-		Assert.notNull(sessionManager, "'sessionManager' must not be null.");
+		Assert.notNull(sessionManager, "WebSessionManager must not be null");
 		this.sessionManager = sessionManager;
 	}
 

spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java

@@ -66,7 +66,7 @@ public class WebHttpHandlerBuilder {
 	 * See factory method {@link #webHandler(WebHandler)}.
 	 */
 	private WebHttpHandlerBuilder(WebHandler targetHandler) {
-		Assert.notNull(targetHandler, "'targetHandler' must not be null");
+		Assert.notNull(targetHandler, "WebHandler must not be null");
 		this.targetHandler = targetHandler;
 	}
 

spring-web/src/main/java/org/springframework/web/server/handler/ExceptionHandlingWebHandler.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server.handler;
 
 import java.util.Arrays;
@@ -24,9 +25,9 @@ import org.apache.commons.logging.LogFactory;
 import reactor.core.publisher.Mono;
 
 import org.springframework.http.HttpStatus;
+import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebExceptionHandler;
 import org.springframework.web.server.WebHandler;
-import org.springframework.web.server.ServerWebExchange;
 
 /**
  * WebHandler that can invoke a target {@link WebHandler} and then apply
@@ -39,7 +40,6 @@ public class ExceptionHandlingWebHandler extends WebHandlerDecorator {
 
 	private static Log logger = LogFactory.getLog(ExceptionHandlingWebHandler.class);
 
-
 	private final List<WebExceptionHandler> exceptionHandlers;
 
 

spring-web/src/main/java/org/springframework/web/server/handler/FilteringWebHandler.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server.handler;
 
 import java.util.Arrays;
@@ -21,10 +22,10 @@ import java.util.List;
 
 import reactor.core.publisher.Mono;
 
+import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
 import org.springframework.web.server.WebFilterChain;
 import org.springframework.web.server.WebHandler;
-import org.springframework.web.server.ServerWebExchange;
 
 /**
  * WebHandler that delegates to a chain of {@link WebFilter} instances and then
@@ -44,7 +45,7 @@ public class FilteringWebHandler extends WebHandlerDecorator {
 	}
 
 	private static List<WebFilter> initList(WebFilter[] list) {
-		return (list != null ? Collections.unmodifiableList(Arrays.asList(list)): Collections.emptyList());
+		return (list != null ? Collections.unmodifiableList(Arrays.asList(list)) : Collections.emptyList());
 	}
 
 
@@ -65,7 +66,6 @@ public class FilteringWebHandler extends WebHandlerDecorator {
 
 		private int index;
 
-
 		@Override
 		public Mono<Void> filter(ServerWebExchange exchange) {
 			if (this.index < filters.size()) {

spring-web-reactive/src/main/java/org/springframework/web/reactive/ResponseStatusExceptionHandler.java → spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.web.reactive;
+
+package org.springframework.web.server.handler;
 
 import reactor.core.publisher.Mono;
 
 import org.springframework.web.server.ResponseStatusException;
-import org.springframework.web.server.WebExceptionHandler;
 import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebExceptionHandler;
 
 /**
  * Handle {@link ResponseStatusException} by setting the response status.
@@ -29,7 +30,6 @@ import org.springframework.web.server.ServerWebExchange;
  */
 public class ResponseStatusExceptionHandler implements WebExceptionHandler {
 
-
 	@Override
 	public Mono<Void> handle(ServerWebExchange exchange, Throwable ex) {
 		if (ex instanceof ResponseStatusException) {

spring-web/src/main/java/org/springframework/web/server/handler/WebHandlerDecorator.java

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server.handler;
 
 import reactor.core.publisher.Mono;
 
 import org.springframework.util.Assert;
-import org.springframework.web.server.WebHandler;
 import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebHandler;
 
 /**
  * {@link WebHandler} that decorates and delegates to another.

spring-web-reactive/src/test/java/org/springframework/web/reactive/ResponseStatusExceptionHandlerTests.java → spring-web/src/test/java/org/springframework/web/server/handler/ResponseStatusExceptionHandlerTests.java

 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.web.reactive;
+
+package org.springframework.web.server.handler;
 
 import java.net.URI;
 import java.time.Duration;
@@ -32,8 +33,7 @@ import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
 import org.springframework.web.server.session.MockWebSessionManager;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.Assert.*;
 
 /**
  * Unit tests for {@link ResponseStatusExceptionHandler}.