Skip to content

Commit 701c39a

Browse files
committed
Update @propertysource Javadoc regarding resource patterns
See gh-21325
1 parent d77595b commit 701c39a

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,14 @@
184184
* <p>The default {@link #factory() factory} supports both traditional and
185185
* XML-based properties file formats &mdash; for example,
186186
* {@code "classpath:/com/myco/app.properties"} or {@code "file:/path/to/file.xml"}.
187-
* <p>Resource location wildcards (e.g. *&#42;/*.properties) are not permitted;
188-
* each location must evaluate to exactly one resource.
189-
* <p>${...} placeholders will be resolved against property sources already
187+
* <p>As of Spring Framework 6.1, resource location wildcards are also
188+
* supported &mdash; for example, {@code "classpath*:/config/*.properties"}.
189+
* <p>{@code ${...}} placeholders will be resolved against property sources already
190190
* registered with the {@code Environment}. See {@linkplain PropertySource above}
191191
* for examples.
192192
* <p>Each location will be added to the enclosing {@code Environment} as its own
193-
* property source, and in the order declared.
193+
* property source, and in the order declared (or in the order in which resource
194+
* locations are resolved when location wildcards are used).
194195
*/
195196
String[] value();
196197

0 commit comments

Comments
 (0)