Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Sam Brannen
2025-03-03 15:05:11 +01:00
parent 5ffd88cd89 7789e12575
commit 955cc2039b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
View File

@@ -41,9 +41,9 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
* Abstract, generic extension of {@link AbstractContextLoader} that loads a
* {@link GenericWebApplicationContext}.
*
* <p>If instances of concrete subclasses are invoked via the
* <p>Instances of concrete subclasses are invoked via the
* {@link org.springframework.test.context.SmartContextLoader SmartContextLoader}
* SPI, the context will be loaded from the {@link MergedContextConfiguration}
* SPI, and the context will be loaded from the {@link MergedContextConfiguration}
* provided to {@link #loadContext(MergedContextConfiguration)}. In such cases, a
* {@code SmartContextLoader} will decide whether to load the context from
* <em>locations</em> or <em>annotated classes</em>. Note that {@code
@@ -58,7 +58,6 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
* @author Phillip Webb
* @since 3.2
* @see #loadContext(MergedContextConfiguration)
* @see #loadContext(String...)
*/
public abstract class AbstractGenericWebContextLoader extends AbstractContextLoader implements AotContextLoader {