Browse Source

Clarify component scan include-filter semantics

Issue: SPR-13844
pull/1120/head
Juergen Hoeller 10 years ago
parent
commit
837cb752a4
  1. 13
      spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java
  2. 3
      spring-context/src/main/resources/org/springframework/context/config/spring-context-4.2.xsd
  3. 3
      spring-context/src/main/resources/org/springframework/context/config/spring-context-4.3.xsd

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

@ -1,5 +1,5 @@ @@ -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");
* you may not use this file except in compliance with the License.
@ -127,10 +127,13 @@ public @interface ComponentScan { @@ -127,10 +127,13 @@ public @interface ComponentScan {
/**
* Specifies which types are eligible for component scanning.
* <p>Further narrows the set of candidate components from everything in
* {@link #basePackages} to everything in the base packages that matches
* the given filter or filters.
* @see #resourcePattern
* <p>Further narrows the set of candidate components from everything in {@link #basePackages}
* to everything in the base packages that matches the given filter or filters.
* <p>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 {@code @Component}).
* @see #resourcePattern()
* @see #useDefaultFilters()
*/
Filter[] includeFilters() default {};

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

@ -235,6 +235,9 @@ @@ -235,6 +235,9 @@
<xsd:annotation>
<xsd:documentation><![CDATA[
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:annotation>
</xsd:element>

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

@ -235,6 +235,9 @@ @@ -235,6 +235,9 @@
<xsd:annotation>
<xsd:documentation><![CDATA[
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:annotation>
</xsd:element>

Loading…
Cancel
Save