Polish "Simplify some code"

snicoll · snicoll · commit 6f28f41774a2 · 2019-08-14T08:55:20.000+02:00
See spring-projectsgh-17860
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
@@ -97,8 +97,11 @@ private WebEndpointResponse<Health> createWebEndpointResponse(Health health) {
 	}
 
 	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) {

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,11 @@ private WebEndpointResponse<Health> createWebEndpointResponse(Health health) {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`private boolean canSeeDetails(SecurityContext securityContext, ShowDetails showDetails) {`
`100`		`- return showDetails != ShowDetails.NEVER && (showDetails != ShowDetails.WHEN_AUTHORIZED`
`101`		`- \|\| (securityContext.getPrincipal() != null && isUserInRole(securityContext)));`
	`100`	`+ if (showDetails == ShowDetails.NEVER \|\| (showDetails == ShowDetails.WHEN_AUTHORIZED`
	`101`	`+ && (securityContext.getPrincipal() == null \|\| !isUserInRole(securityContext)))) {`
	`102`	`+ return false;`
	`103`	`+ }`
	`104`	`+ return true;`
`102`	`105`	`}`
`103`	`106`
`104`	`107`	`private boolean isUserInRole(SecurityContext securityContext) {`