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

Refactor ReloadableResourceBundleMessageSource 

This change allows subclasses to reuse collecting and merging
algorithm when overriding getMergedProperties method.
This commit is contained in:
Andrei Bastun 2024-01-25 13:02:02 +01:00 committed by Juergen Hoeller
parent 341ac76209
commit c559ec4dfb
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
View File

@ -257,29 +257,42 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
return mergedHolder;
}
Properties mergedProps = newProperties();
long latestTimestamp = -1;
List<PropertiesHolder> holders = collectPropertiesToMerge(locale);
mergedHolder = merge(holders);
PropertiesHolder existing = this.cachedMergedProperties.putIfAbsent(locale, mergedHolder);
if (existing != null) {
mergedHolder = existing;
}
return mergedHolder;
}
protected List<PropertiesHolder> collectPropertiesToMerge(Locale locale) {
String[] basenames = StringUtils.toStringArray(getBasenameSet());
List<PropertiesHolder> holders = new ArrayList<>(basenames.length);
for (int i = basenames.length - 1; i >= 0; i--) {
List<String> filenames = calculateAllFilenames(basenames[i], locale);
for (int j = filenames.size() - 1; j >= 0; j--) {
String filename = filenames.get(j);
PropertiesHolder propHolder = getProperties(filename);
if (propHolder.getProperties() != null) {
mergedProps.putAll(propHolder.getProperties());
if (propHolder.getFileTimestamp() > latestTimestamp) {
latestTimestamp = propHolder.getFileTimestamp();
}
holders.add(propHolder);
}
}
}
return holders;
}
mergedHolder = new PropertiesHolder(mergedProps, latestTimestamp);
PropertiesHolder existing = this.cachedMergedProperties.putIfAbsent(locale, mergedHolder);
if (existing != null) {
mergedHolder = existing;
protected PropertiesHolder merge(List<PropertiesHolder> holders) {
Properties mergedProps = newProperties();
long latestTimestamp = -1;
for (PropertiesHolder holder : holders) {
mergedProps.putAll(holder.getProperties());
if (holder.getFileTimestamp() > latestTimestamp) {
latestTimestamp = holder.getFileTimestamp();
}
}
return mergedHolder;
return new PropertiesHolder(mergedProps, latestTimestamp);
}
/**