From ff87826a1fe740e394218c7c000825f2985fdfda Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 24 Sep 2022 02:41:06 +0000 Subject: [PATCH] Bumping versions --- .../config/server/environment/EnvironmentController.java | 6 ++---- .../server/environment/NativeEnvironmentRepository.java | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java index 5d0298ed..fbf79907 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java @@ -103,14 +103,12 @@ public class EnvironmentController { this.acceptEmpty = acceptEmpty; } - @GetMapping(path = "/{name}/{profiles:[^\\.]*}", - produces = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(path = "/{name}/{profiles:[^\\.]*}", produces = MediaType.APPLICATION_JSON_VALUE) public Environment defaultLabel(@PathVariable String name, @PathVariable String profiles) { return getEnvironment(name, profiles, null, false); } - @GetMapping(path = "/{name}/{profiles:[^\\.]*}", - produces = EnvironmentMediaType.V2_JSON) + @GetMapping(path = "/{name}/{profiles:[^\\.]*}", produces = EnvironmentMediaType.V2_JSON) public Environment defaultLabelIncludeOrigin(@PathVariable String name, @PathVariable String profiles) { return getEnvironment(name, profiles, null, true); } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java index 67e5656d..50760546 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java @@ -271,7 +271,8 @@ public class NativeEnvironmentRepository implements EnvironmentRepository, Searc } } name = name.replace("\\", "/"); // change windows path '\' into '/' - name = name.replaceAll("\\[(?=\\w:)", "[/"); // change [D:/path] into [/D:/path] + name = name.replaceAll("\\[(?=\\w:)", "[/"); // change [D:/path] into + // [/D:/path] name = name.replace("applicationConfig: [", ""); name = name.replace("file [", "file:"); name = name.replace("class path resource [", "classpath:/");