spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Support "classpath*:" prefix for resource bundle basename

Browse Source 
Closes gh-36292
See gh-36415
This commit is contained in:
Juergen Hoeller
2026-03-16 12:23:35 +01:00
parent 1345760087
commit 391dd90e84
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
+11 -7
View File
@@ -60,9 +60,13 @@ import org.springframework.util.StringUtils;
* are treated in a slightly different fashion than the "basenames" property of
* {@link ResourceBundleMessageSource}. It follows the basic ResourceBundle rule of not
* specifying file extension or language codes, but can refer to any Spring resource
* location (instead of being restricted to classpath resources). With a "classpath:"
* prefix, resources can still be loaded from the classpath, but "cacheSeconds" values
* other than "-1" (caching forever) might not work reliably in this case.
* location (instead of being restricted to classpath resources).
*
* <p>With a "classpath:" prefix, resources can still be loaded from the classpath,
* but "cacheSeconds" values other than "-1" (caching forever) are not expected to
* be effective in this case. As of 7.1, a "classpath*:" prefix is accepted as well,
* loading all classpath resources of the same fully-qualified name: for example,
* "classpath*:/messages.properties" or "classpath*:META-INF/messages.properties".
*
* <p>For a typical web application, message files could be placed in {@code WEB-INF}:
* for example, a "WEB-INF/messages" basename would find a "WEB-INF/messages.properties",
@@ -562,8 +566,8 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
*/
protected Properties loadProperties(Resource resource, String filename) throws IOException {
Properties props = newProperties();
try (InputStream inputStream = resource.getInputStream()) {
String resourceFilename = resource.getFilename();
String resourceFilename = resource.getFilename();
resource.consumeContent(inputStream -> {
if (resourceFilename != null && resourceFilename.endsWith(XML_EXTENSION)) {
if (logger.isDebugEnabled()) {
logger.debug("Loading properties [" + resource.getFilename() + "]");
@@ -594,8 +598,8 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
this.propertiesPersister.load(props, inputStream);
}
}
return props;
}
});
return props;
}
/**