updates after code review

Author: mmoayyed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfiguration.java

@@ -19,13 +19,10 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Properties;
 
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.beans.factory.config.PropertiesFactoryBean;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -45,10 +42,9 @@
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.core.Ordered;
-import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.PropertiesLoaderUtils;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.StringUtils;
@@ -91,19 +87,12 @@ public MessageSource messageSource(MessageSourceProperties properties) {
 		messageSource.setUseCodeAsDefaultMessage(properties.isUseCodeAsDefaultMessage());
 
 		try {
-			if (StringUtils.hasText(properties.getCommonMessages())) {
-				PropertiesFactoryBean propertiesFactory = new PropertiesFactoryBean();
-				ResourceLoader resourceLoader = new DefaultResourceLoader();
-				String[] commonMessages = StringUtils.commaDelimitedListToStringArray(
-						StringUtils.trimAllWhitespace(properties.getCommonMessages()));
-				List<Resource> commonResources = Arrays.stream(commonMessages)
-						.map(resourceLoader::getResource)
-						.toList();
-				propertiesFactory.setLocations(commonResources.toArray(Resource[]::new));
-				propertiesFactory.setSingleton(true);
-				propertiesFactory.setIgnoreResourceNotFound(true);
-				propertiesFactory.afterPropertiesSet();
-				messageSource.setCommonMessages(propertiesFactory.getObject());
+			if (properties.getCommonMessages() != null) {
+				Properties commonProperties = new Properties();
+				for (Resource commonResource : properties.getCommonMessages()) {
+					PropertiesLoaderUtils.fillProperties(commonProperties, commonResource);
+				}
+				messageSource.setCommonMessages(commonProperties);
 			}
 		} catch (IOException e) {
 			throw new UncheckedIOException("Failed to load common messages", e);

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceProperties.java

@@ -20,9 +20,11 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
+import java.util.List;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.convert.DurationUnit;
+import org.springframework.core.io.Resource;
 
 /**
  * Configuration properties for Message Source.
@@ -45,7 +47,7 @@ public class MessageSourceProperties {
 	/**
 	 * Comma-separated list of locale-independent common messages.
 	 */
-	private String commonMessages;
+	private List<Resource> commonMessages;
 
 	/**
 	 * Message bundles encoding.
@@ -126,11 +128,11 @@ public void setUseCodeAsDefaultMessage(boolean useCodeAsDefaultMessage) {
 		this.useCodeAsDefaultMessage = useCodeAsDefaultMessage;
 	}
 
-	public String getCommonMessages() {
+	public List<Resource> getCommonMessages() {
 		return this.commonMessages;
 	}
 
-	public void setCommonMessages(String commonMessages) {
+	public void setCommonMessages(List<Resource> commonMessages) {
 		this.commonMessages = commonMessages;
 	}
 }