spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Update Javadoc for active profile ordering

Browse Source 
Following gh-26004, the registration order of active profiles in
@⁠ActiveProfiles is preserved; however, the Javadoc in
MergedContextConfiguration and WebMergedContextConfiguration still
described the old sorting behavior, which is misleading since profile
order is part of the context cache key (equals/hashCode).

This commit updates the Javadoc to document the status quo.

Closes gh-36950

Signed-off-by: Alexis SEGURA <alex.segura06@gmail.com>
This commit is contained in:
Alexis SEGURA
2026-07-25 11:04:11 +03:00
committed by Sam Brannen
parent b5de644cbb
commit e255ccca7d
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
+6 -6
View File
@@ -190,8 +190,8 @@ public class MergedContextConfiguration implements Serializable {
* or {@code propertySourceProperties} an empty array will be stored instead. * or {@code propertySourceProperties} an empty array will be stored instead.
* If a {@code null} value is supplied for the * If a {@code null} value is supplied for the
* {@code contextInitializerClasses} an empty set will be stored instead. * {@code contextInitializerClasses} an empty set will be stored instead.
* Furthermore, active profiles will be sorted, and duplicate profiles * Furthermore, duplicate active profiles will be removed while preserving
* will be removed. * registration order.
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations * @param locations the merged context resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
@@ -229,8 +229,8 @@ public class MergedContextConfiguration implements Serializable {
* or {@code propertySourceProperties} an empty array will be stored instead. * or {@code propertySourceProperties} an empty array will be stored instead.
* If a {@code null} value is supplied for {@code contextInitializerClasses} * If a {@code null} value is supplied for {@code contextInitializerClasses}
* or {@code contextCustomizers}, an empty set will be stored instead. * or {@code contextCustomizers}, an empty set will be stored instead.
* Furthermore, active profiles will be sorted, and duplicate profiles * Furthermore, duplicate active profiles will be removed while preserving
* will be removed. * registration order.
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations * @param locations the merged context resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
@@ -268,8 +268,8 @@ public class MergedContextConfiguration implements Serializable {
* {@code activeProfiles}, or {@code propertySourceProperties} an empty array * {@code activeProfiles}, or {@code propertySourceProperties} an empty array
* will be stored instead. If a {@code null} value is supplied for * will be stored instead. If a {@code null} value is supplied for
* {@code contextInitializerClasses} or {@code contextCustomizers}, an empty * {@code contextInitializerClasses} or {@code contextCustomizers}, an empty
* set will be stored instead. Furthermore, active profiles will be sorted, * set will be stored instead. Furthermore, duplicate active profiles
* and duplicate profiles will be removed. * will be removed while preserving registration order.
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations * @param locations the merged context resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
+6 -6
View File
@@ -87,8 +87,8 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
* If a {@code null} value is supplied for the * If a {@code null} value is supplied for the
* {@code contextInitializerClasses} an empty set will be stored instead. * {@code contextInitializerClasses} an empty set will be stored instead.
* If an <em>empty</em> value is supplied for the {@code resourceBasePath} * If an <em>empty</em> value is supplied for the {@code resourceBasePath}
* an empty string will be used. Furthermore, active profiles will be sorted, * an empty string will be used. Furthermore, duplicate active profiles
* and duplicate profiles will be removed. * will be removed while preserving registration order.
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged resource locations * @param locations the merged resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
@@ -125,8 +125,8 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
* If a {@code null} value is supplied for {@code contextInitializerClasses} * If a {@code null} value is supplied for {@code contextInitializerClasses}
* or {@code contextCustomizers}, an empty set will be stored instead. * or {@code contextCustomizers}, an empty set will be stored instead.
* If an <em>empty</em> value is supplied for the {@code resourceBasePath} * If an <em>empty</em> value is supplied for the {@code resourceBasePath}
* an empty string will be used. Furthermore, active profiles will be sorted, * an empty string will be used. Furthermore, duplicate active profiles
* and duplicate profiles will be removed. * will be removed while preserving registration order.
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations * @param locations the merged context resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
@@ -164,8 +164,8 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
* {@code activeProfiles}, or {@code propertySourceProperties} an empty array * {@code activeProfiles}, or {@code propertySourceProperties} an empty array
* will be stored instead. If a {@code null} value is supplied for * will be stored instead. If a {@code null} value is supplied for
* {@code contextInitializerClasses} or {@code contextCustomizers}, an empty * {@code contextInitializerClasses} or {@code contextCustomizers}, an empty
* set will be stored instead. Furthermore, active profiles will be sorted, * set will be stored instead. Furthermore, duplicate active profiles
* and duplicate profiles will be removed. * will be removed while preserving registration order.
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations * @param locations the merged context resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes