Merge branch '2.4.x'

Closes gh-26139
spring-projects · Apr 15, 2021 · 9682386 · 9682386
2 parents 5142fe9 + 302d500
commit 9682386
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/...ot/src/main/java/org/springframework/boot/context/config/StandardConfigDataReference.java b/...ot/src/main/java/org/springframework/boot/context/config/StandardConfigDataReference.java
@@ -74,6 +74,10 @@ String getDirectory() {
 		return this.directory;
 	}
 
+	String getProfile() {
+		return this.profile;
+	}
+
 	boolean isSkippable() {
 		return this.configDataLocation.isOptional() || this.directory != null || this.profile != null;
 	}

diff --git a/...oot/src/main/java/org/springframework/boot/context/config/StandardConfigDataResource.java b/...oot/src/main/java/org/springframework/boot/context/config/StandardConfigDataResource.java
@@ -74,6 +74,15 @@ public Resource getResource() {
 		return this.resource;
 	}
 
+	/**
+	 * Return the profile or {@code null} if the resource is not profile specific.
+	 * @return the profile or {@code null}
+	 * @since 2.4.6
+	 */
+	public String getProfile() {
+		return this.reference.getProfile();
+	}
+
 	boolean isEmptyDirectory() {
 		return this.emptyDirectory;
 	}

diff --git a/...java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorTests.java b/...java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorTests.java
@@ -127,6 +127,13 @@ void applyToAppliesPostProcessing() {
 		assertThat(this.environment.getActiveProfiles()).containsExactly("dev");
 		assertThat(listener.getAddedPropertySources()).hasSizeGreaterThan(0);
 		assertThat(listener.getProfiles().getActive()).containsExactly("dev");
+		assertThat(listener.getAddedPropertySources().stream().anyMatch((added) -> hasDevProfile(added.getResource())))
+				.isTrue();
+	}
+
+	private boolean hasDevProfile(ConfigDataResource resource) {
+		return (resource instanceof StandardConfigDataResource)
+				&& "dev".equals(((StandardConfigDataResource) resource).getProfile());
 	}
 
 }