From b25e2221360666a3ccaa0f2e234c049769b6983f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 15 Oct 2018 14:12:12 -0700 Subject: [PATCH] Retain original case when mapping endpoint paths Update `MappingWebEndpointPathMapper` to keep the original case rather than using a lower-case version. Closes gh-14773 --- .../endpoint/web/MappingWebEndpointPathMapper.java | 2 +- .../endpoint/web/MappingWebEndpointPathMapperTests.java | 2 +- .../springframework/boot/actuate/endpoint/web/PathMapper.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java index 9bed06f81b..c9757dd117 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java @@ -46,7 +46,7 @@ class MappingWebEndpointPathMapper implements PathMapper { @Override public String getRootPath(EndpointId endpointId) { - return this.pathMapping.getOrDefault(endpointId, endpointId.toLowerCaseString()); + return this.pathMapping.getOrDefault(endpointId, endpointId.toString()); } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapperTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapperTests.java index d9d1d0aa92..432d9cd849 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapperTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapperTests.java @@ -50,7 +50,7 @@ public class MappingWebEndpointPathMapperTests { MappingWebEndpointPathMapper mapper = new MappingWebEndpointPathMapper( Collections.emptyMap()); assertThat(mapper.getRootPath(EndpointId.of("testEndpoint"))) - .isEqualTo("testendpoint"); + .isEqualTo("testEndpoint"); } @Test diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java index 12af95b1fd..64c874b0f8 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java @@ -63,7 +63,7 @@ public interface PathMapper { @Override public String getRootPath(EndpointId endpointId) { - return endpointId.toLowerCaseString(); + return endpointId.toString(); } };