Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
7278d478
Commit
7278d478
authored
Mar 09, 2018
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12419 from izeye:map-status
* pr/12419: Invoke mapStatus() only when necessary
parents
3642636b
3c9cee2a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
HealthWebEndpointResponseMapper.java
.../boot/actuate/health/HealthWebEndpointResponseMapper.java
+1
-1
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java
View file @
7278d478
...
@@ -65,13 +65,13 @@ public class HealthWebEndpointResponseMapper {
...
@@ -65,13 +65,13 @@ public class HealthWebEndpointResponseMapper {
*/
*/
public
WebEndpointResponse
<
Health
>
map
(
Health
health
,
SecurityContext
securityContext
,
public
WebEndpointResponse
<
Health
>
map
(
Health
health
,
SecurityContext
securityContext
,
ShowDetails
showDetails
)
{
ShowDetails
showDetails
)
{
Integer
status
=
this
.
statusHttpMapper
.
mapStatus
(
health
.
getStatus
());
if
(
showDetails
==
ShowDetails
.
NEVER
if
(
showDetails
==
ShowDetails
.
NEVER
||
(
showDetails
==
ShowDetails
.
WHEN_AUTHORIZED
||
(
showDetails
==
ShowDetails
.
WHEN_AUTHORIZED
&&
(
securityContext
.
getPrincipal
()
==
null
&&
(
securityContext
.
getPrincipal
()
==
null
||
!
isUserInRole
(
securityContext
))))
{
||
!
isUserInRole
(
securityContext
))))
{
health
=
Health
.
status
(
health
.
getStatus
()).
build
();
health
=
Health
.
status
(
health
.
getStatus
()).
build
();
}
}
Integer
status
=
this
.
statusHttpMapper
.
mapStatus
(
health
.
getStatus
());
return
new
WebEndpointResponse
<>(
health
,
status
);
return
new
WebEndpointResponse
<>(
health
,
status
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment