SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Ryan Baxter
2023-05-03 14:14:31 -04:00
parent 7f9af92c4f 5a1797ac47
commit a3db3392dc
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,7 +225,7 @@ public class NativeEnvironmentRepository implements EnvironmentRepository, Searc
Map<String, Object> map = new HashMap<>();
map.put("spring.profiles.active", profile);
String config = application;
if (!config.startsWith("application")) {
if (!config.equals("application")) {
config = "application," + config;
}
map.put("spring.config.name", config);

9
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepositoryTests.java
View File

@@ -193,6 +193,15 @@ public class NativeEnvironmentRepositoryTests {
assertThat(environment.getPropertySources().get(0).getSource().get("foo")).isEqualTo("app");
}
@Test
public void placeholdersApplicationWithPrefixAndProfile() {
this.repository.setSearchLocations("classpath:/test/{profile}/{application}/");
// gh-2259 application name starts with "application"
Environment environment = this.repository.findOne("applicationxyz", "dev", "master");
assertThat(environment.getPropertySources().size()).isEqualTo(1);
assertThat(environment.getPropertySources().get(0).getSource().get("foo")).isEqualTo("default-app");
}
@Test
public void locationPlaceholdersApplication() {
this.repository.setSearchLocations("classpath:/test/{application}");

1
spring-cloud-config-server/src/test/resources/test/dev/applicationxyz/application.properties Normal file
View File

@@ -0,0 +1 @@
foo:default-app