From 6f28f41774a2f08fea7e079a1df0433831cc4bf3 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 14 Aug 2019 08:55:20 +0200
Subject: [PATCH] Polish "Simplify some code"

See gh-17860
---
 .../actuate/health/HealthWebEndpointResponseMapper.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 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
index e863eb330bd..868d8280235 100644
--- 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) {