From 26a68ca2cfda5fb4bf0730edf77877f9f35585d1 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 11 Jan 2021 12:04:07 -0800 Subject: [PATCH 1/2] Polish --- .../main/java/org/springframework/boot/SpringApplication.java | 4 +++- .../src/main/java/org/springframework/boot/origin/Origin.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index 4de6268310..b8424d29d6 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1274,6 +1274,7 @@ public class SpringApplication { /** * Set the {@link ApplicationStartup} to use for collecting startup metrics. * @param applicationStartup the application startup to use + * @since 2.4.0 */ public void setApplicationStartup(ApplicationStartup applicationStartup) { this.applicationStartup = (applicationStartup != null) ? applicationStartup : ApplicationStartup.DEFAULT; @@ -1282,6 +1283,7 @@ public class SpringApplication { /** * Returns the {@link ApplicationStartup} used for collecting startup metrics. * @return the application startup + * @since 2.4.0 */ public ApplicationStartup getApplicationStartup() { return this.applicationStartup; diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/Origin.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/Origin.java index c4f719fe8d..455638ed4d 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/Origin.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/Origin.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -78,6 +78,7 @@ public interface Origin { * @param source the source object or {@code null} * @return a list of parents or an empty list if the source is {@code null}, has no * origin, or no parent + * @since 2.4.0 */ static List parentsFrom(Object source) { Origin origin = from(source); From 039df1d96dde43ec98361deef954c25ef6af630d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 11 Jan 2021 12:04:14 -0800 Subject: [PATCH 2/2] Test spring.profiles.include in profile file Add a test to ensure that `spring.profiles.include` is not silently ignored when used in a profile-specific file. See gh-24733 --- ...onfigDataEnvironmentPostProcessorIntegrationTests.java | 8 +++++++- ...lude-profiles-in-profile-specific-document.properties} | 0 ...lude-profiles-in-profile-specific-file-test.properties | 1 + ...n-include-profiles-in-profile-specific-file.properties | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) rename spring-boot-project/spring-boot/src/test/resources/{application-include-profiles-in-profile-specific.properties => application-include-profiles-in-profile-specific-document.properties} (100%) create mode 100644 spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties create mode 100644 spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java index b27a920fc3..f9fab25644 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java @@ -630,8 +630,14 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests { @Test void runWhenHasIncludedProfilesWithProfileSpecificDocumentThrowsException() { + assertThatExceptionOfType(InactiveConfigDataAccessException.class).isThrownBy(() -> this.application.run( + "--spring.config.location=classpath:application-include-profiles-in-profile-specific-document.properties")); + } + + @Test + void runWhenHasIncludedProfilesWithProfileSpecificFileThrowsException() { assertThatExceptionOfType(InactiveConfigDataAccessException.class).isThrownBy(() -> this.application - .run("--spring.config.location=classpath:application-include-profiles-in-profile-specific.properties")); + .run("--spring.config.name=application-include-profiles-in-profile-specific-document")); } @Test diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific.properties b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-document.properties similarity index 100% rename from spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific.properties rename to spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-document.properties diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties new file mode 100644 index 0000000000..70251f9e7f --- /dev/null +++ b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties @@ -0,0 +1 @@ +spring.profiles.include=p2 diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties new file mode 100644 index 0000000000..f841722a2f --- /dev/null +++ b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties @@ -0,0 +1 @@ +spring.profiles.active=test