Browse Source

Polish "Simplify some code"

See gh-17860
pull/17864/head
Stephane Nicoll 7 years ago
parent
commit
6f28f41774
  1. 7
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java

7
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java

@ -97,8 +97,11 @@ public class HealthWebEndpointResponseMapper { @@ -97,8 +97,11 @@ public class HealthWebEndpointResponseMapper {
}
private boolean canSeeDetails(SecurityContext securityContext, ShowDetails showDetails) {
return showDetails != ShowDetails.NEVER && (showDetails != ShowDetails.WHEN_AUTHORIZED
|| (securityContext.getPrincipal() != null && isUserInRole(securityContext)));
if (showDetails == ShowDetails.NEVER || (showDetails == ShowDetails.WHEN_AUTHORIZED
&& (securityContext.getPrincipal() == null || !isUserInRole(securityContext)))) {
return false;
}
return true;
}
private boolean isUserInRole(SecurityContext securityContext) {

Loading…
Cancel
Save