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 pull request #12419 from izeye:map-status 

* pr/12419:
  Invoke mapStatus() only when necessary
This commit is contained in:
Stephane Nicoll 2018-03-09 16:26:58 +01:00
parent 3642636b60 3c9cee2a8c
commit 7278d478bf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java
View File

@ -65,13 +65,13 @@ public class HealthWebEndpointResponseMapper {
*/ */
public WebEndpointResponse<Health> map(Health health, SecurityContext securityContext, public WebEndpointResponse<Health> map(Health health, SecurityContext securityContext,
ShowDetails showDetails) { ShowDetails showDetails) {
Integer status = this.statusHttpMapper.mapStatus(health.getStatus());
if (showDetails == ShowDetails.NEVER if (showDetails == ShowDetails.NEVER
|| (showDetails == ShowDetails.WHEN_AUTHORIZED || (showDetails == ShowDetails.WHEN_AUTHORIZED
&& (securityContext.getPrincipal() == null && (securityContext.getPrincipal() == null
|| !isUserInRole(securityContext)))) { || !isUserInRole(securityContext)))) {
health = Health.status(health.getStatus()).build(); health = Health.status(health.getStatus()).build();
} }
Integer status = this.statusHttpMapper.mapStatus(health.getStatus());
return new WebEndpointResponse<>(health, status); return new WebEndpointResponse<>(health, status);
} }