From 1b3289d0d521e66da67fadf75a62752470772ec0 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Tue, 15 Dec 2015 17:04:53 -0500
Subject: [PATCH] Add InternalServerErrorExceptionHandler

---
 .../InternalServerErrorExceptionHandler.java  | 36 +++++++++++++++++++
 .../ErrorHandlingHttpHandlerTests.java        | 23 ++----------
 2 files changed, 39 insertions(+), 20 deletions(-)
 create mode 100644 spring-web-reactive/src/main/java/org/springframework/http/server/reactive/InternalServerErrorExceptionHandler.java

diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/InternalServerErrorExceptionHandler.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/InternalServerErrorExceptionHandler.java
new file mode 100644
index 0000000000..b9a69eac64
--- /dev/null
+++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/InternalServerErrorExceptionHandler.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2015 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.http.server.reactive;
+
+import org.reactivestreams.Publisher;
+
+import org.springframework.http.HttpStatus;
+
+/**
+ * Handle any exception by setting the response status to 500.
+ *
+ * @author Rossen Stoyanchev
+ */
+public class InternalServerErrorExceptionHandler implements HttpExceptionHandler {
+
+
+	@Override
+	public Publisher<Void> handle(ServerHttpRequest request, ServerHttpResponse response, Throwable ex) {
+		response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
+		return response.writeHeaders();
+	}
+
+}
diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandlerTests.java
index 4b93f15cc6..6a744ecb81 100644
--- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandlerTests.java
+++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandlerTests.java
@@ -31,7 +31,6 @@ import org.springframework.http.HttpStatus;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Rossen Stoyanchev
@@ -53,7 +52,7 @@ public class ErrorHandlingHttpHandlerTests {
 
 	@Test
 	public void handleErrorSignal() throws Exception {
-		HttpExceptionHandler exceptionHandler = new HttpStatusExceptionHandler(HttpStatus.INTERNAL_SERVER_ERROR);
+		HttpExceptionHandler exceptionHandler = new InternalServerErrorExceptionHandler();
 		HttpHandler targetHandler = new TestHttpHandler(new IllegalStateException("boo"));
 		HttpHandler handler = new ErrorHandlingHttpHandler(targetHandler, exceptionHandler);
 
@@ -68,7 +67,7 @@ public class ErrorHandlingHttpHandlerTests {
 		HttpExceptionHandler[] exceptionHandlers = new HttpExceptionHandler[] {
 				new UnresolvedExceptionHandler(),
 				new UnresolvedExceptionHandler(),
-				new HttpStatusExceptionHandler(HttpStatus.INTERNAL_SERVER_ERROR),
+				new InternalServerErrorExceptionHandler(),
 				new UnresolvedExceptionHandler()
 		};
 		HttpHandler targetHandler = new TestHttpHandler(new IllegalStateException("boo"));
@@ -95,7 +94,7 @@ public class ErrorHandlingHttpHandlerTests {
 
 	@Test
 	public void thrownExceptionBecomesErrorSignal() throws Exception {
-		HttpExceptionHandler exceptionHandler = new HttpStatusExceptionHandler(HttpStatus.INTERNAL_SERVER_ERROR);
+		HttpExceptionHandler exceptionHandler = new InternalServerErrorExceptionHandler();
 		HttpHandler targetHandler = new TestHttpHandler(new IllegalStateException("boo"), true);
 		HttpHandler handler = new ErrorHandlingHttpHandler(targetHandler, exceptionHandler);
 
@@ -148,20 +147,4 @@ public class ErrorHandlingHttpHandlerTests {
 		}
 	}
 
-	/** Set the response status to the given HttpStatus. */
-	private static class HttpStatusExceptionHandler implements HttpExceptionHandler {
-
-		private final HttpStatus status;
-
-		public HttpStatusExceptionHandler(HttpStatus status) {
-			this.status = status;
-		}
-
-		@Override
-		public Publisher<Void> handle(ServerHttpRequest request, ServerHttpResponse response, Throwable ex) {
-			response.setStatusCode(this.status);
-			return Publishers.empty();
-		}
-	}
-
 }