Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add javadoc and rename merge method to mergeProperties

Browse Source 
See gh-32118
This commit is contained in:
Juergen Hoeller
2024-02-06 09:13:09 +01:00
parent 9c15b3fa4c
commit 9698dbc232
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2024 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.
@@ -110,6 +110,7 @@ public abstract class AbstractResourceBasedMessageSource extends AbstractMessage
* in the order of registration.
* <p>Calling code may introspect this set as well as add or remove entries.
* @since 4.3
* @see #setBasenames
* @see #addBasenames
*/
public Set<String> getBasenameSet() {

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

@@ -250,16 +250,15 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
* <p>Only used when caching resource bundle contents forever, i.e.
* with cacheSeconds &lt; 0. Therefore, merged properties are always
* cached forever.
* @see #collectPropertiesToMerge
* @see #mergeProperties
*/
protected PropertiesHolder getMergedProperties(Locale locale) {
PropertiesHolder mergedHolder = this.cachedMergedProperties.get(locale);
if (mergedHolder != null) {
return mergedHolder;
}
List<PropertiesHolder> holders = collectPropertiesToMerge(locale);
mergedHolder = merge(holders);
mergedHolder = mergeProperties(collectPropertiesToMerge(locale));
PropertiesHolder existing = this.cachedMergedProperties.putIfAbsent(locale, mergedHolder);
if (existing != null) {
mergedHolder = existing;
@@ -267,6 +266,15 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
return mergedHolder;
}
/**
* Determine the properties to merge based on the specified basenames.
* @param locale the locale
* @return the list of properties holders
* @since 6.1.4
* @see #getBasenameSet()
* @see #calculateAllFilenames
* @see #mergeProperties
*/
protected List<PropertiesHolder> collectPropertiesToMerge(Locale locale) {
String[] basenames = StringUtils.toStringArray(getBasenameSet());
List<PropertiesHolder> holders = new ArrayList<>(basenames.length);
@@ -283,7 +291,16 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
return holders;
}
protected PropertiesHolder merge(List<PropertiesHolder> holders) {
/**
* Merge the given properties holders into a single holder.
* @param holders the list of properties holders
* @return a single merged holder
* @since 6.1.4
* @see #newProperties()
* @see #getMergedProperties
* @see #collectPropertiesToMerge
*/
protected PropertiesHolder mergeProperties(List<PropertiesHolder> holders) {
Properties mergedProps = newProperties();
long latestTimestamp = -1;
for (PropertiesHolder holder : holders) {