Skip to content

Include shared application properties for names starting with application in JDBC repository #3369

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
ryanjbaxter merged 1 commit into from
Nov 2, 2026
Merged

Include shared application properties for names starting with application in JDBC repository #3369

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
5 changes: 2 additions & 3 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 @@ -106,9 +106,8 @@ public Environment findOne(String application, String profile, String label) {
}
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
Environment environment = new Environment(application, profiles, label, null, null);
if (!config.startsWith("application")) {
config = "application," + config;
}
// the shared "application" is always included, duplicates are removed below
config = "application," + config;
List<String> applications = new ArrayList<>(
new LinkedHashSet<>(Arrays.asList(StringUtils.commaDelimitedListToStringArray(config))));
List<String> envs = new ArrayList<>(new LinkedHashSet<>(Arrays.asList(profiles)));
Expand Down
9 changes: 0 additions & 9 deletions .../cloud/config/server/environment/compliance/JdbcEnvironmentRepositoryComplianceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import org.springframework.cloud.config.server.environment.EnvironmentRepository;
import org.springframework.cloud.config.server.environment.JdbcEnvironmentProperties;
Expand Down Expand Up @@ -61,13 +59,6 @@ protected EnvironmentRepositoryFixture fixture() {
return this.fixture;
}

@Override
@Test
@Disabled("TODO-issue: Shared application properties are skipped when the application name starts with application")
public void applicationNameStartingWithApplicationIncludesSharedFiles() throws Exception {
super.applicationNameStartingWithApplicationIncludesSharedFiles();
}

static class Fixture implements EnvironmentRepositoryFixture {

private final JdbcTemplate jdbc = new JdbcTemplate(database);
Expand Down
Loading