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

Adjust the priority of the configs (#2207)

Browse Source
This commit is contained in:
woshikid
2023-01-12 04:04:23 +08:00
committed by GitHub
parent c43fdc770f
commit 97cc9c87a5
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java
View File

@@ -119,12 +119,14 @@ public class JdbcEnvironmentRepository implements EnvironmentRepository, Ordered
List<String> envs = new ArrayList<>(new LinkedHashSet<>(Arrays.asList(profiles)));
Collections.reverse(applications);
Collections.reverse(envs);
for (String app : applications) {
for (String env : envs) {
for (String env : envs) {
for (String app : applications) {
addPropertySource(environment, app, env, label);
}
// add properties without profile, equivalent to foo.yml, application.yml
if (!configIncomplete) {
}
// add properties without profile, equivalent to foo.yml, application.yml
if (!configIncomplete) {
for (String app : applications) {
addPropertySource(environment, app, null, label);
}
}

32
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java
View File

@@ -63,10 +63,10 @@ public class JdbcEnvironmentRepositoryTests {
assertThat(env.getPropertySources()).isNotEmpty();
assertThat(env.getPropertySources().get(0).getName()).isEqualTo("foo-bar");
assertThat(env.getPropertySources().get(0).getSource().get("a.b.c")).isEqualTo("foo-bar");
assertThat(env.getPropertySources().get(1).getName()).isEqualTo("foo");
assertThat(env.getPropertySources().get(1).getSource().get("a.b.c")).isEqualTo("foo-null");
assertThat(env.getPropertySources().get(2).getName()).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(2).getSource().get("a.b.c")).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(1).getName()).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(1).getSource().get("a.b.c")).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(2).getName()).isEqualTo("foo");
assertThat(env.getPropertySources().get(2).getSource().get("a.b.c")).isEqualTo("foo-null");
assertThat(env.getPropertySources().get(3).getName()).isEqualTo("application");
assertThat(env.getPropertySources().get(3).getSource().get("a.b.c")).isEqualTo("application-null");
}
@@ -82,10 +82,10 @@ public class JdbcEnvironmentRepositoryTests {
assertThat(env.getPropertySources()).isNotEmpty();
assertThat(env.getPropertySources().get(0).getName()).isEqualTo("foo-default");
assertThat(env.getPropertySources().get(0).getSource().get("a.b.c")).isEqualTo("foo-default");
assertThat(env.getPropertySources().get(1).getName()).isEqualTo("foo");
assertThat(env.getPropertySources().get(1).getSource().get("a.b.c")).isEqualTo("foo-null");
assertThat(env.getPropertySources().get(2).getName()).isEqualTo("application-default");
assertThat(env.getPropertySources().get(2).getSource().get("a.b.c")).isEqualTo("application-default");
assertThat(env.getPropertySources().get(1).getName()).isEqualTo("application-default");
assertThat(env.getPropertySources().get(1).getSource().get("a.b.c")).isEqualTo("application-default");
assertThat(env.getPropertySources().get(2).getName()).isEqualTo("foo");
assertThat(env.getPropertySources().get(2).getSource().get("a.b.c")).isEqualTo("foo-null");
assertThat(env.getPropertySources().get(3).getName()).isEqualTo("application");
assertThat(env.getPropertySources().get(3).getSource().get("a.b.c")).isEqualTo("application-null");
}
@@ -147,10 +147,10 @@ public class JdbcEnvironmentRepositoryTests {
assertThat(env.getPropertySources()).isNotEmpty();
assertThat(env.getPropertySources().get(0).getName()).isEqualTo("foo-bar");
assertThat(env.getPropertySources().get(0).getSource().get("a.b.c")).isEqualTo("foo-bar");
assertThat(env.getPropertySources().get(1).getName()).isEqualTo("foo");
assertThat(env.getPropertySources().get(1).getSource().get("a.b.c")).isEqualTo("foo-null");
assertThat(env.getPropertySources().get(2).getName()).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(2).getSource().get("a.b.c")).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(1).getName()).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(1).getSource().get("a.b.c")).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(2).getName()).isEqualTo("foo");
assertThat(env.getPropertySources().get(2).getSource().get("a.b.c")).isEqualTo("foo-null");
assertThat(env.getPropertySources().get(3).getName()).isEqualTo("application");
assertThat(env.getPropertySources().get(3).getSource().get("a.b.c")).isEqualTo("application-null");
}
@@ -167,10 +167,10 @@ public class JdbcEnvironmentRepositoryTests {
assertThat(env.getPropertySources()).isNotEmpty();
assertThat(env.getPropertySources().get(0).getName()).isEqualTo("foo-bar");
assertThat(env.getPropertySources().get(0).getSource().get("a.b.c")).isEqualTo("foo-bar");
assertThat(env.getPropertySources().get(1).getName()).isEqualTo("foo-default");
assertThat(env.getPropertySources().get(1).getSource().get("a.b.c")).isEqualTo("foo-default");
assertThat(env.getPropertySources().get(2).getName()).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(2).getSource().get("a.b.c")).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(1).getName()).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(1).getSource().get("a.b.c")).isEqualTo("application-bar");
assertThat(env.getPropertySources().get(2).getName()).isEqualTo("foo-default");
assertThat(env.getPropertySources().get(2).getSource().get("a.b.c")).isEqualTo("foo-default");
assertThat(env.getPropertySources().get(3).getName()).isEqualTo("application-default");
assertThat(env.getPropertySources().get(3).getSource().get("a.b.c")).isEqualTo("application-default");
}