root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-07-25 11:48:20 +02:00
parent 514398e8c8 64c668f766
commit a2494df596
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -563,7 +563,7 @@ JMX or an HTTP request is converted to the required types using an instance of
[[production-ready-endpoints-custom-web]] [[production-ready-endpoints-custom-web]]
==== Custom Web Endpoints ==== 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. exposed over HTTP using Jersey, Spring MVC, or Spring WebFlux.

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

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

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

@ -18,4 +18,4 @@ spring.jmx.enabled=true
spring.jackson.serialization.write_dates_as_timestamps=false 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