Skip to content

S
spring-boot
Commit 3c9cee2a authored by Johnny Lim's avatar Johnny Lim Committed by Stephane Nicoll
Browse files
Options

Invoke mapStatus() only when necessary 

Closes gh-12419
parent 3642636b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java
View file @ 3c9cee2a
...@@ -65,13 +65,13 @@ public class HealthWebEndpointResponseMapper { ...@@ -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);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment