Add rawStatusCode() to ServerResponse in both WebFlux and Servlet

Closes gh-22872

Author: poutsma

spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java

@@ -349,6 +349,11 @@ public final HttpStatus statusCode() {
 			return HttpStatus.valueOf(this.statusCode);
 		}
 
+		@Override
+		public int rawStatusCode() {
+			return this.statusCode;
+		}
+
 		@Override
 		public final HttpHeaders headers() {
 			return this.headers;

spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java

@@ -60,9 +60,21 @@ public interface ServerResponse {
 
 	/**
 	 * Return the status code of this response.
+	 * @return the status as an HttpStatus enum value
+	 * @throws IllegalArgumentException in case of an unknown HTTP status code
+	 * @see HttpStatus#valueOf(int)
 	 */
 	HttpStatus statusCode();
 
+	/**
+	 * Return the (potentially non-standard) status code of this response.
+	 * @return the status as an integer
+	 * @since 5.2
+	 * @see #statusCode()
+	 * @see HttpStatus#resolve(int)
+	 */
+	int rawStatusCode();
+
 	/**
 	 * Return the headers of this response.
 	 */

spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilderTests.java

@@ -90,7 +90,8 @@ public void status() {
 		String body = "foo";
 		Mono<EntityResponse<String>> result = EntityResponse.fromObject(body).status(HttpStatus.CREATED).build();
 		StepVerifier.create(result)
-				.expectNextMatches(response -> HttpStatus.CREATED.equals(response.statusCode()))
+				.expectNextMatches(response -> HttpStatus.CREATED.equals(response.statusCode()) &&
+						response.rawStatusCode() == 201)
 				.expectComplete()
 				.verify();
 	}

spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java

@@ -86,7 +86,8 @@ public void from() {
 	public void status() {
 		Mono<ServerResponse> result = ServerResponse.status(HttpStatus.CREATED).build();
 		StepVerifier.create(result)
-				.expectNextMatches(response -> HttpStatus.CREATED.equals(response.statusCode()))
+				.expectNextMatches(response -> HttpStatus.CREATED.equals(response.statusCode()) &&
+						response.rawStatusCode() == 201)
 				.expectComplete()
 				.verify();
 	}

spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java

@@ -195,6 +195,10 @@ public HttpStatus statusCode() {
 						return HttpStatus.OK;
 					}
 					@Override
+					public int rawStatusCode() {
+						return 200;
+					}
+					@Override
 					public HttpHeaders headers() {
 						return new HttpHeaders();
 					}
@@ -229,6 +233,10 @@ public HttpStatus statusCode() {
 						return HttpStatus.OK;
 					}
 					@Override
+					public int rawStatusCode() {
+						return 200;
+					}
+					@Override
 					public HttpHeaders headers() {
 						return new HttpHeaders();
 					}

spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java

@@ -264,6 +264,11 @@ public final HttpStatus statusCode() {
 			return HttpStatus.valueOf(this.statusCode);
 		}
 
+		@Override
+		public int rawStatusCode() {
+			return this.statusCode;
+		}
+
 		@Override
 		public final HttpHeaders headers() {
 			return this.headers;

spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java

@@ -57,9 +57,20 @@ public interface ServerResponse {
 
 	/**
 	 * Return the status code of this response.
+	 * @return the status as an HttpStatus enum value
+	 * @throws IllegalArgumentException in case of an unknown HTTP status code
+	 * @see HttpStatus#valueOf(int)
 	 */
 	HttpStatus statusCode();
 
+	/**
+	 * Return the (potentially non-standard) status code of this response.
+	 * @return the status as an integer
+	 * @see #statusCode()
+	 * @see HttpStatus#valueOf(int)
+	 */
+	int rawStatusCode();
+
 	/**
 	 * Return the headers of this response.
 	 */

spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java

@@ -81,6 +81,7 @@ public void status() {
 				EntityResponse.fromObject(body).status(HttpStatus.CREATED).build();
 
 		assertThat(result.statusCode()).isEqualTo(HttpStatus.CREATED);
+		assertThat(result.rawStatusCode()).isEqualTo(201);
 	}
 
 	@Test

spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java

@@ -67,6 +67,7 @@ public List<HttpMessageConverter<?>> messageConverters() {
 	public void status() {
 		ServerResponse response = ServerResponse.status(HttpStatus.CREATED).build();
 		assertThat(response.statusCode()).isEqualTo(HttpStatus.CREATED);
+		assertThat(response.rawStatusCode()).isEqualTo(201);
 	}
 
 	@Test