root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Clarify component scan include-filter semantics 

Issue: SPR-13844
This commit is contained in:
Juergen Hoeller 2016-01-25 20:24:26 +01:00
parent ebad8db8d5
commit 837cb752a4
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -127,10 +127,13 @@ public @interface ComponentScan {
/** /**
* Specifies which types are eligible for component scanning. * Specifies which types are eligible for component scanning.
* <p>Further narrows the set of candidate components from everything in * <p>Further narrows the set of candidate components from everything in {@link #basePackages}
* {@link #basePackages} to everything in the base packages that matches * to everything in the base packages that matches the given filter or filters.
* the given filter or filters. * <p>Note that these filters will be applied in addition to the default filters, if specified.
* @see #resourcePattern * Any type under the specified base packages which matches a given filter will be included,
* even if it does not match the default filters (i.e. is not annotated with {@code @Component}).
* @see #resourcePattern()
* @see #useDefaultFilters()
*/ */
Filter[] includeFilters() default {}; Filter[] includeFilters() default {};

3
spring-context/src/main/resources/org/springframework/context/config/spring-context-4.2.xsd
View File

@ -235,6 +235,9 @@
<xsd:annotation> <xsd:annotation>
<xsd:documentation><![CDATA[ <xsd:documentation><![CDATA[
Controls which eligible types to include for component scanning. Controls which eligible types to include for component scanning.
Note that these filters will be applied in addition to the default filters, if specified.
Any type under the specified base packages which matches a given filter will be included,
even if it does not match the default filters (i.e. is not annotated with @Component).
]]></xsd:documentation> ]]></xsd:documentation>
</xsd:annotation> </xsd:annotation>
</xsd:element> </xsd:element>

3
spring-context/src/main/resources/org/springframework/context/config/spring-context-4.3.xsd
View File

@ -235,6 +235,9 @@
<xsd:annotation> <xsd:annotation>
<xsd:documentation><![CDATA[ <xsd:documentation><![CDATA[
Controls which eligible types to include for component scanning. Controls which eligible types to include for component scanning.
Note that these filters will be applied in addition to the default filters, if specified.
Any type under the specified base packages which matches a given filter will be included,
even if it does not match the default filters (i.e. is not annotated with @Component).
]]></xsd:documentation> ]]></xsd:documentation>
</xsd:annotation> </xsd:annotation>
</xsd:element> </xsd:element>