Skip to content

S
spring-boot
Commit 9e0b1c29 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge pull request #15784 from vpavic 

* pr/15784:
  Remove duplicate code from HealthWebEndpointResponseMapper
parents c488934c d7550d73
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java
View file @ 9e0b1c29
/* /*
* Copyright 2012-2018 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -88,10 +88,7 @@ public class HealthWebEndpointResponseMapper { ...@@ -88,10 +88,7 @@ public class HealthWebEndpointResponseMapper {
*/ */
public WebEndpointResponse<Health> map(Health health, SecurityContext securityContext, public WebEndpointResponse<Health> map(Health health, SecurityContext securityContext,
ShowDetails showDetails) { ShowDetails showDetails) {
if (showDetails == ShowDetails.NEVER if (!canSeeDetails(securityContext, showDetails)) {
|| (showDetails == ShowDetails.WHEN_AUTHORIZED
&& (securityContext.getPrincipal() == null
|| !isUserInRole(securityContext)))) {
health = Health.status(health.getStatus()).build(); health = Health.status(health.getStatus()).build();
} }
return createWebEndpointResponse(health); return createWebEndpointResponse(health);
......
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