Skip to content

Commit d3678ca

Browse files
committed
Polish Javadoc
1 parent f30b7e3 commit d3678ca

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

org.springframework.context/src/main/java/org/springframework/context/annotation/ComponentScan.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@
4444
* @author Chris Beams
4545
* @since 3.1
4646
*/
47-
@Documented
48-
@FeatureAnnotation(parser=ComponentScanAnnotationParser.class)
4947
@Retention(RetentionPolicy.RUNTIME)
5048
@Target(ElementType.TYPE)
49+
@Documented
5150
public @interface ComponentScan {
5251

5352
/**
@@ -89,6 +88,7 @@
8988
* necessary when using scopes in a proxy-style fashion.
9089
* <p>The default is defer to the default behavior of the component scanner used to
9190
* execute the actual scan.
91+
* <p>Note that setting this attribute overrides any value set for {@link #scopeResolver()}.
9292
* @see ClassPathBeanDefinitionScanner#setScopedProxyMode(ScopedProxyMode)
9393
*/
9494
ScopedProxyMode scopedProxy() default ScopedProxyMode.DEFAULT;

org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.springframework.core.type.filter.TypeFilter;
2323

2424
/**
25-
* Unit tests for {@link ComponentScan} annotation.
25+
* Unit tests for the @ComponentScan annotation.
2626
*
2727
* @author Chris Beams
2828
* @since 3.1

0 commit comments

Comments
 (0)