From 725cbd9bc8d7b52fc2f9a6a4a7f1ee04532b3fb2 Mon Sep 17 00:00:00 2001 From: Ingyu Hwang Date: Thu, 13 Jun 2019 16:15:09 +0900 Subject: [PATCH 1/2] Use existing properties field See gh-17129 --- .../endpoint/web/WebEndpointAutoConfiguration.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java index 4380988471..39765a6e0d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java @@ -112,9 +112,8 @@ public class WebEndpointAutoConfiguration { @Bean @ConditionalOnMissingBean - public PathMappedEndpoints pathMappedEndpoints(Collection> endpointSuppliers, - WebEndpointProperties webEndpointProperties) { - return new PathMappedEndpoints(webEndpointProperties.getBasePath(), endpointSuppliers); + public PathMappedEndpoints pathMappedEndpoints(Collection> endpointSuppliers) { + return new PathMappedEndpoints(properties.getBasePath(), endpointSuppliers); } @Bean From 46c2da4a19466de23ab6afeca7e2ec4095b8806e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jun 2019 09:54:51 +0200 Subject: [PATCH 2/2] Polish "Use existing properties field" See gh-17129 --- .../endpoint/web/WebEndpointAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java index 39765a6e0d..2e228666a1 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java @@ -113,7 +113,7 @@ public class WebEndpointAutoConfiguration { @Bean @ConditionalOnMissingBean public PathMappedEndpoints pathMappedEndpoints(Collection> endpointSuppliers) { - return new PathMappedEndpoints(properties.getBasePath(), endpointSuppliers); + return new PathMappedEndpoints(this.properties.getBasePath(), endpointSuppliers); } @Bean