fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add search=CURRENT to MessageSourceAutoConfiguration

Browse Source 
Fixes gh-3803
This commit is contained in:
Dave Syer 2015-08-21 15:44:01 +01:00
parent 089cda7af4
commit 68b55adac0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java
View File

@ -16,7 +16,11 @@
package org.springframework.boot.autoconfigure; package org.springframework.boot.autoconfigure;
import static org.springframework.util.StringUtils.commaDelimitedListToStringArray;
import static org.springframework.util.StringUtils.trimAllWhitespace;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.SearchStrategy;
import org.springframework.boot.bind.RelaxedPropertyResolver; import org.springframework.boot.bind.RelaxedPropertyResolver;
import org.springframework.context.EnvironmentAware; import org.springframework.context.EnvironmentAware;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;
@ -28,16 +32,13 @@ import org.springframework.core.annotation.Order;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import static org.springframework.util.StringUtils.commaDelimitedListToStringArray;
import static org.springframework.util.StringUtils.trimAllWhitespace;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for {@link MessageSource}. * {@link EnableAutoConfiguration Auto-configuration} for {@link MessageSource}.
* *
* @author Dave Syer * @author Dave Syer
*/ */
@Configuration @Configuration
@ConditionalOnMissingBean(MessageSource.class) @ConditionalOnMissingBean(value=MessageSource.class, search=SearchStrategy.CURRENT)
@Order(Ordered.HIGHEST_PRECEDENCE) @Order(Ordered.HIGHEST_PRECEDENCE)
public class MessageSourceAutoConfiguration implements EnvironmentAware { public class MessageSourceAutoConfiguration implements EnvironmentAware {
@ -54,7 +55,7 @@ public class MessageSourceAutoConfiguration implements EnvironmentAware {
String basename = this.environment.getProperty("basename", "messages"); String basename = this.environment.getProperty("basename", "messages");
if (StringUtils.hasText(basename)) { if (StringUtils.hasText(basename)) {
messageSource messageSource
.setBasenames(commaDelimitedListToStringArray(trimAllWhitespace(basename))); .setBasenames(commaDelimitedListToStringArray(trimAllWhitespace(basename)));
} }
String encoding = this.environment.getProperty("encoding", "utf-8"); String encoding = this.environment.getProperty("encoding", "utf-8");
messageSource.setDefaultEncoding(encoding); messageSource.setDefaultEncoding(encoding);