Skip to content

Commit 579a3cd

Browse files
committed
Bumping versions
1 parent 2a9730c commit 579a3cd

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,12 @@ public void setAcceptEmpty(boolean acceptEmpty) {
104104
this.acceptEmpty = acceptEmpty;
105105
}
106106

107-
@GetMapping(path = "/{name}/{profiles:[^\\.]*}",
108-
produces = MediaType.APPLICATION_JSON_VALUE)
107+
@GetMapping(path = "/{name}/{profiles:[^\\.]*}", produces = MediaType.APPLICATION_JSON_VALUE)
109108
public Environment defaultLabel(@PathVariable String name, @PathVariable String profiles) {
110109
return getEnvironment(name, profiles, null, false);
111110
}
112111

113-
@GetMapping(path = "/{name}/{profiles:[^\\.]*}",
114-
produces = EnvironmentMediaType.V2_JSON)
112+
@GetMapping(path = "/{name}/{profiles:[^\\.]*}", produces = EnvironmentMediaType.V2_JSON)
115113
public Environment defaultLabelIncludeOrigin(@PathVariable String name, @PathVariable String profiles) {
116114
return getEnvironment(name, profiles, null, true);
117115
}

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ protected Environment clean(Environment env,
265265
}
266266
}
267267
name = name.replace("\\", "/"); // change windows path '\' into '/'
268-
name = name.replaceAll("\\[(?=\\w:)", "[/"); // change [D:/path] into [/D:/path]
268+
name = name.replaceAll("\\[(?=\\w:)", "[/"); // change [D:/path] into
269+
// [/D:/path]
269270
name = name.replace("applicationConfig: [", "");
270271
name = name.replace("file [", "file:");
271272
name = name.replace("class path resource [", "classpath:/");

0 commit comments

Comments
 (0)