Skip to content

Adjust the priority of the configs #2207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 11, 2023
Merged

Adjust the priority of the configs #2207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...n/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,14 @@ public Environment findOne(String application, String profile, String label) {
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);
}
}
Expand Down
32 changes: 16 additions & 16 deletions ...a/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ public void basicProperties() {
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");
}
Expand All @@ -82,10 +82,10 @@ public void testDefaultProfile() {
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");
}
Expand Down Expand Up @@ -147,10 +147,10 @@ public void testCustomSql() {
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");
}
Expand All @@ -167,10 +167,10 @@ public void testIncompleteConfig() {
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");
}
Expand Down