Merge branch '2.0.x'

spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

@@ -563,7 +563,7 @@ JMX or an HTTP request is converted to the required types using an instance of
 
 [[production-ready-endpoints-custom-web]]
 ==== Custom Web Endpoints
-Operations on an `@Endpoint`, `@WebEndpoint`, or `@WebEndpointExtension` are automatically
+Operations on an `@Endpoint`, `@WebEndpoint`, or `@EndpointWebExtension` are automatically
 exposed over HTTP using Jersey, Spring MVC, or Spring WebFlux.
 
 

spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java

@@ -33,14 +33,7 @@ public class SampleActuatorApplication {
 
 	@Bean
 	public HealthIndicator helloHealthIndicator() {
-		return new HealthIndicator() {
-
-			@Override
-			public Health health() {
-				return Health.up().withDetail("hello", "world").build();
-			}
-
-		};
+		return () -> Health.up().withDetail("hello", "world").build();
 	}
 
 }

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

@@ -18,4 +18,4 @@ spring.jmx.enabled=true
 
 spring.jackson.serialization.write_dates_as_timestamps=false
 
-management.httptrace.include=REQUEST_HEADERS,RESPONSE_HEADERS,PRINCIPAL,REMOTE_ADDRESS,SESSION_ID
+management.trace.http.include=request-headers,response-headers,principal,remote-address,session-id