Skip to content

Commit 8ccedd4

Browse files
committed
[SPR-8541] Documented DelegatingSmartContextLoader.
1 parent 466c3b4 commit 8ccedd4

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

org.springframework.test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.apache.commons.logging.Log;
2323
import org.apache.commons.logging.LogFactory;
2424
import org.springframework.context.ApplicationContext;
25-
import org.springframework.context.annotation.Configuration;
2625
import org.springframework.test.context.ContextConfiguration;
2726
import org.springframework.test.context.ContextConfigurationAttributes;
2827
import org.springframework.test.context.ContextLoader;
@@ -42,13 +41,14 @@
4241
* that supports the merged, processed configuration will be used to actually
4342
* {@link #loadContext load} the context.
4443
*
45-
* <p>Placing an empty {@code @ContextConfiguration} annotation on
46-
* a test class signals that default resource locations (i.e., XML configuration files)
47-
* or default {@link Configuration configuration classes} should be detected. Furthermore,
48-
* if a specific {@link ContextLoader} or {@link SmartContextLoader} is not explicitly
49-
* declared via {@code @ContextConfiguration}, {@code DelegatingSmartContextLoader} will
50-
* be used as the default loader, thus providing automatic support for either XML
51-
* configuration files or configuration classes, but not both simultaneously.
44+
* <p>Placing an empty {@code @ContextConfiguration} annotation on a test class signals
45+
* that default resource locations (i.e., XML configuration files) or default
46+
* {@link org.springframework.context.annotation.Configuration configuration classes}
47+
* should be detected. Furthermore, if a specific {@link ContextLoader} or
48+
* {@link SmartContextLoader} is not explicitly declared via
49+
* {@code @ContextConfiguration}, {@code DelegatingSmartContextLoader} will be used as
50+
* the default loader, thus providing automatic support for either XML configuration
51+
* files or configuration classes, but not both simultaneously.
5252
*
5353
* @author Sam Brannen
5454
* @since 3.1

0 commit comments

Comments
 (0)