Skip to content

Update Javadoc for @ActiveProfiles ordering #36950

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

Open
alexisgra wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −12
Open

Update Javadoc for @ActiveProfiles ordering #36950

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
12 changes: 6 additions & 6 deletions spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ public MergedContextConfiguration(MergedContextConfiguration mergedConfig) {
* or {@code propertySourceProperties} an empty array will be stored instead.
* If a {@code null} value is supplied for the
* {@code contextInitializerClasses} an empty set will be stored instead.
* Furthermore, active profiles will be sorted, and duplicate profiles
* will be removed.
* Furthermore, duplicate active profiles will be removed while preserving
* registration order.
* @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations
* @param classes the merged annotated classes
Expand Down Expand Up @@ -229,8 +229,8 @@ public MergedContextConfiguration(Class<?> testClass, String @Nullable [] locati
* or {@code propertySourceProperties} an empty array will be stored instead.
* If a {@code null} value is supplied for {@code contextInitializerClasses}
* or {@code contextCustomizers}, an empty set will be stored instead.
* Furthermore, active profiles will be sorted, and duplicate profiles
* will be removed.
* Furthermore, duplicate active profiles will be removed while preserving
* registration order.
* @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations
* @param classes the merged annotated classes
Expand Down Expand Up @@ -268,8 +268,8 @@ public MergedContextConfiguration(Class<?> testClass, String @Nullable [] locati
* {@code activeProfiles}, or {@code propertySourceProperties} an empty array
* will be stored instead. If a {@code null} value is supplied for
* {@code contextInitializerClasses} or {@code contextCustomizers}, an empty
* set will be stored instead. Furthermore, active profiles will be sorted,
* and duplicate profiles will be removed.
* set will be stored instead. Furthermore, duplicate active profiles
* will be removed while preserving registration order.
* @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations
* @param classes the merged annotated classes
Expand Down
12 changes: 6 additions & 6 deletions ...est/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ public WebMergedContextConfiguration(MergedContextConfiguration mergedConfig, St
* If a {@code null} value is supplied for the
* {@code contextInitializerClasses} an empty set will be stored instead.
* If an <em>empty</em> value is supplied for the {@code resourceBasePath}
* an empty string will be used. Furthermore, active profiles will be sorted,
* and duplicate profiles will be removed.
* an empty string will be used. Furthermore, duplicate active profiles
* will be removed while preserving registration order.
* @param testClass the test class for which the configuration was merged
* @param locations the merged resource locations
* @param classes the merged annotated classes
Expand Down Expand Up @@ -125,8 +125,8 @@ public WebMergedContextConfiguration(Class<?> testClass, String @Nullable [] loc
* If a {@code null} value is supplied for {@code contextInitializerClasses}
* or {@code contextCustomizers}, an empty set will be stored instead.
* If an <em>empty</em> value is supplied for the {@code resourceBasePath}
* an empty string will be used. Furthermore, active profiles will be sorted,
* and duplicate profiles will be removed.
* an empty string will be used. Furthermore, duplicate active profiles
* will be removed while preserving registration order.
* @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations
* @param classes the merged annotated classes
Expand Down Expand Up @@ -164,8 +164,8 @@ public WebMergedContextConfiguration(Class<?> testClass, String @Nullable [] loc
* {@code activeProfiles}, or {@code propertySourceProperties} an empty array
* will be stored instead. If a {@code null} value is supplied for
* {@code contextInitializerClasses} or {@code contextCustomizers}, an empty
* set will be stored instead. Furthermore, active profiles will be sorted,
* and duplicate profiles will be removed.
* set will be stored instead. Furthermore, duplicate active profiles
* will be removed while preserving registration order.
* @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations
* @param classes the merged annotated classes
Expand Down