Polish "Simplify some code"

See gh-17860

Polish "Simplify some code"
See gh-17860
6f28f417 · Stephane Nicoll · 4bb84234 · 6f28f417
Commit 6f28f417 authored Aug 14, 2019 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

HealthWebEndpointResponseMapper.java .../boot/actuate/health/HealthWebEndpointResponseMapper.java +5 -2

No files found.
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java
@@ -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) {