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

#1075 - Improvements in I18N configuration setup.

Browse Source 
We now avoid a double-lookup of the default messages in the resource bundle setup. Tightened the test case to make sure the sample resource bundle is properly used, even if no default messages bundle is present.
This commit is contained in:
Oliver Drotbohm
2019-09-20 17:11:24 +02:00
parent 9ddfdc8639
commit 1a2ddfaa2a
3 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java
View File

@@ -31,7 +31,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
import org.springframework.context.support.AbstractMessageSource;
import org.springframework.context.support.AbstractResourceBasedMessageSource;
import org.springframework.context.support.ReloadableResourceBundleMessageSource;
import org.springframework.core.io.Resource;
import org.springframework.hateoas.client.LinkDiscoverer;
@@ -63,6 +62,9 @@ import org.springframework.util.ClassUtils;
@EnablePluginRegistries({ LinkDiscoverer.class })
public class HateoasConfiguration {
static String I18N_BASE_NAME = "rest-messages";
static String I18N_DEFAULTS_BASE_NAME = "rest-default-messages";
private @Autowired ApplicationContext context;
@Bean
@@ -119,14 +121,15 @@ public class HateoasConfiguration {
@Nullable
private final AbstractMessageSource lookupMessageSource() {
List<Resource> candidates = loadProperties("rest-default-messages", false);
List<Resource> candidates = loadResourceBundleResources(I18N_DEFAULTS_BASE_NAME, false);
if (candidates.isEmpty() && loadProperties("rest-messages", true).isEmpty()) {
if (candidates.isEmpty() && loadResourceBundleResources(I18N_BASE_NAME, true).isEmpty()) {
return null;
}
AbstractResourceBasedMessageSource messageSource = new ReloadableResourceBundleMessageSource();
messageSource.setBasename("classpath:rest-messages");
ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
messageSource.setResourceLoader(context);
messageSource.setBasename(I18N_BASE_NAME);
messageSource.setDefaultEncoding(StandardCharsets.UTF_8.toString());
if (!candidates.isEmpty()) {
@@ -139,10 +142,8 @@ public class HateoasConfiguration {
@Nullable
private final Properties loadProperties(List<Resource> sources) {
Resource[] resources = loadProperties("rest-default-messages", false).stream().toArray(Resource[]::new);
PropertiesFactoryBean factory = new PropertiesFactoryBean();
factory.setLocations(resources);
factory.setLocations(sources.toArray(new Resource[sources.size()]));
try {
@@ -154,7 +155,7 @@ public class HateoasConfiguration {
}
}
private final List<Resource> loadProperties(String baseName, boolean withWildcard) {
private final List<Resource> loadResourceBundleResources(String baseName, boolean withWildcard) {
try {
return Arrays //