Adjust the priority of the configs

spring-cloud · Jan 12, 2023 · 4d0c516 · 4d0c516
1 parent 9e9eb71
commit 4d0c516
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...ig/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySources.java b/...ig/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySources.java
@@ -49,7 +49,6 @@ public List<Context> generateAutomaticContexts(List<String> profiles, boolean re
 
 		String defaultContext = root + "/" + properties.getDefaultContext();
 		contexts.add(new Context(defaultContext));
-		addProfiles(contexts, defaultContext, profiles);
 
 		StringBuilder baseContext = new StringBuilder(root);
 		if (!properties.getName().startsWith("/")) {
@@ -58,6 +57,9 @@ public List<Context> generateAutomaticContexts(List<String> profiles, boolean re
 		// getName() defaults to ${spring.application.name} or application
 		baseContext.append(properties.getName());
 		contexts.add(new Context(baseContext.toString()));
+
+		// profiles have a higher priority, should be added at the end
+		addProfiles(contexts, defaultContext, profiles);
 		addProfiles(contexts, baseContext.toString(), profiles);
 
 		if (reverse) {

diff --git a/.../java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorTests.java b/.../java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorTests.java
@@ -227,9 +227,9 @@ public void compositePropertySourceHoldsPropertySourcesInCorrectOrder() {
 
 		assertThat(propertySources.get(0).getName())
 				.endsWith(someName + properties.getProfileSeparator() + someProfile);
-		assertThat(propertySources.get(1).getName()).endsWith(someName);
-		assertThat(propertySources.get(2).getName()).endsWith(
+		assertThat(propertySources.get(1).getName()).endsWith(
 				defaultContext + properties.getProfileSeparator() + someProfile);
+		assertThat(propertySources.get(2).getName()).endsWith(someName);
 		assertThat(propertySources.get(3).getName()).endsWith(defaultContext);
 	}