Drop status endpoint

Drop the status endpoint and merge functionality back into the health
endpoint. The `management.endpoint.health.show-details` property can
be used to change if full details, or just the status is displayed.

Fixes gh-11113

spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/java/sample/actuator/customsecurity/SecurityConfiguration.java

@@ -41,7 +41,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	protected void configure(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http.authorizeRequests()
-				.requestMatchers(EndpointRequest.to("status", "info")).permitAll()
+				.requestMatchers(EndpointRequest.to("health", "info")).permitAll()
 				.requestMatchers(EndpointRequest.toAnyEndpoint()).hasRole("ACTUATOR")
 				.requestMatchers(StaticResourceRequest.toCommonLocations()).permitAll()
 				.antMatchers("/foo").permitAll()

spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/resources/application.properties

@@ -1 +1,2 @@
 management.endpoints.web.expose=*
+management.endpoint.health.show-details=true

spring-boot-samples/spring-boot-sample-actuator-custom-security/src/test/java/sample/actuator/customsecurity/ManagementPortAndPathSampleActuatorApplicationTests.java

@@ -57,9 +57,9 @@ public class ManagementPortAndPathSampleActuatorApplicationTests {
 
 	@Test
 	public void testSecureActuator() throws Exception {
-		ResponseEntity<String> entity = new TestRestTemplate()
-				.getForEntity("http://localhost:" + this.managementPort
-						+ "/management/application/health", String.class);
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(
+				"http://localhost:" + this.managementPort + "/management/application/env",
+				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
 	}
 
@@ -67,7 +67,7 @@ public class ManagementPortAndPathSampleActuatorApplicationTests {
 	public void testInsecureActuator() throws Exception {
 		ResponseEntity<String> entity = new TestRestTemplate()
 				.getForEntity("http://localhost:" + this.managementPort
-						+ "/management/application/status", String.class);
+						+ "/management/application/health", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).contains("\"status\":\"UP\"");
 	}

spring-boot-samples/spring-boot-sample-actuator-custom-security/src/test/java/sample/actuator/customsecurity/SampleActuatorCustomSecurityApplicationTests.java

@@ -73,7 +73,7 @@ public class SampleActuatorCustomSecurityApplicationTests {
 	@Test
 	public void insecureActuator() throws Exception {
 		ResponseEntity<String> entity = this.restTemplate
-				.getForEntity("/application/status", String.class);
+				.getForEntity("/application/health", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).contains("\"status\":\"UP\"");
 	}