root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Stephane Nicoll 2017-08-28 09:59:32 +02:00
parent 53d855320b
commit c76c16d92b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/support/EndpointEnablementProvider.java
View File

@ -93,8 +93,7 @@ public class EndpointEnablementProvider {
// All endpoints specific attributes have been looked at. Checking default value // All endpoints specific attributes have been looked at. Checking default value
// for the endpoint // for the endpoint
if (!enabledByDefault) { if (!enabledByDefault) {
return new EndpointEnablement(false, createDefaultEnablementMessage( return defaultEndpointEnablement(endpointId, false, endpointType);
endpointId, enabledByDefault, endpointType));
} }
if (endpointType != null) { if (endpointType != null) {
@ -103,9 +102,8 @@ public class EndpointEnablementProvider {
if (globalTypeOutcome != null) { if (globalTypeOutcome != null) {
return globalTypeOutcome; return globalTypeOutcome;
} }
else if (!endpointType.isEnabledByDefault()) { if (!endpointType.isEnabledByDefault()) {
return new EndpointEnablement(false, createDefaultEnablementMessage("all", false, return defaultEndpointEnablement("all", false, endpointType);
endpointType));
} }
} }
else { else {
@ -122,6 +120,11 @@ public class EndpointEnablementProvider {
if (globalOutCome != null) { if (globalOutCome != null) {
return globalOutCome; return globalOutCome;
} }
return defaultEndpointEnablement(endpointId, enabledByDefault, endpointType);
}
private EndpointEnablement defaultEndpointEnablement(String endpointId,
boolean enabledByDefault, EndpointType endpointType) {
return new EndpointEnablement(enabledByDefault, createDefaultEnablementMessage( return new EndpointEnablement(enabledByDefault, createDefaultEnablementMessage(
endpointId, enabledByDefault, endpointType)); endpointId, enabledByDefault, endpointType));
} }