Merge branch '2.2.x' into 2.3.x

Closes gh-24222
spring-projects · Nov 20, 2020 · 7efa1e4 · 7efa1e4
2 parents 0ed7f7f + 12f2529
commit 7efa1e4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/...ngframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java b/...ngframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java
@@ -361,8 +361,7 @@ private ResponseEntity<Object> toResponseEntity(Object response) {
 				return new ResponseEntity<>(response, HttpStatus.OK);
 			}
 			WebEndpointResponse<?> webEndpointResponse = (WebEndpointResponse<?>) response;
-			return new ResponseEntity<>(webEndpointResponse.getBody(),
-					HttpStatus.valueOf(webEndpointResponse.getStatus()));
+			return ResponseEntity.status(webEndpointResponse.getStatus()).body(webEndpointResponse.getBody());
 		}
 
 		@Override

diff --git a/...ringframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java b/...ringframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java
@@ -367,7 +367,7 @@ private Object handleResult(Object result, HttpMethod httpMethod) {
 				return result;
 			}
 			WebEndpointResponse<?> response = (WebEndpointResponse<?>) result;
-			return new ResponseEntity<Object>(response.getBody(), HttpStatus.valueOf(response.getStatus()));
+			return ResponseEntity.status(response.getStatus()).body(response.getBody());
 		}
 
 	}

diff --git a/...ngframework/boot/actuate/endpoint/web/annotation/AbstractWebEndpointIntegrationTests.java b/...ngframework/boot/actuate/endpoint/web/annotation/AbstractWebEndpointIntegrationTests.java
@@ -380,6 +380,12 @@ void userInRoleReturnsTrueWhenUserIsInRole() {
 				.expectStatus().isOk().expectBody(String.class).isEqualTo("ACTUATOR: true"));
 	}
 
+	@Test
+	void endpointCanProduceAResponseWithACustomStatus() {
+		load((context) -> context.register(CustomResponseStatusEndpointConfiguration.class),
+				(client) -> client.get().uri("/customstatus").exchange().expectStatus().isEqualTo(234));
+	}
+
 	protected abstract int getPort(T context);
 
 	protected void validateErrorBody(WebTestClient.BodyContentSpec body, HttpStatus status, String path,
@@ -624,6 +630,17 @@ UserInRoleEndpoint userInRoleEndpoint() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@Import(BaseConfiguration.class)
+	static class CustomResponseStatusEndpointConfiguration {
+
+		@Bean
+		CustomResponseStatusEndpoint customResponseStatusEndpoint() {
+			return new CustomResponseStatusEndpoint();
+		}
+
+	}
+
 	@Endpoint(id = "test")
 	static class TestEndpoint {
 
@@ -850,6 +867,16 @@ String read(SecurityContext securityContext, String role) {
 
 	}
 
+	@Endpoint(id = "customstatus")
+	static class CustomResponseStatusEndpoint {
+
+		@ReadOperation
+		WebEndpointResponse<String> read() {
+			return new WebEndpointResponse<>("Custom status", 234);
+		}
+
+	}
+
 	interface EndpointDelegate {
 
 		void write();