/*
 * Copyright 2012-2014 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.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.springframework.boot.autoconfigure;

import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.bind.RelaxedPropertyResolver;
import org.springframework.context.EnvironmentAware;
import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.ResourceBundleMessageSource;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.core.env.Environment;
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}.
 * 
 * @author Dave Syer
 */
@Configuration
@ConditionalOnMissingBean(MessageSource.class)
@Order(Ordered.HIGHEST_PRECEDENCE)
public class MessageSourceAutoConfiguration implements EnvironmentAware {

	private RelaxedPropertyResolver environment;

	@Override
	public void setEnvironment(Environment environment) {
		this.environment = new RelaxedPropertyResolver(environment, "spring.messages.");
	}

	@Bean
	public MessageSource messageSource() {
		ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
		String basename = this.environment.getProperty("basename", "messages");
		if (StringUtils.hasText(basename)) {
			messageSource
					.setBasenames(commaDelimitedListToStringArray(trimAllWhitespace(basename)));
		}
		String encoding = this.environment.getProperty("encoding", "utf-8");
		messageSource.setDefaultEncoding(encoding);
		messageSource.setCacheSeconds(this.environment.getProperty("cacheSeconds",
				Integer.class, -1));
		return messageSource;
	}

}

@@ -664,16 +664,171 @@
 igure;%0A%0A
+import static org.springframework.util.StringUtils.commaDelimitedListToStringArray;%0Aimport static org.springframework.util.StringUtils.trimAllWhitespace;%0A%0A
 import o
@@ -897,24 +897,96 @@
 issingBean;%0A
+import org.springframework.boot.autoconfigure.condition.SearchStrategy;%0A
 import org.s
@@ -1513,163 +1513,8 @@
 s;%0A%0A
-import static org.springframework.util.StringUtils.commaDelimitedListToStringArray;%0Aimport static org.springframework.util.StringUtils.trimAllWhitespace;%0A%0A
 /**%0A
@@ -1596,17 +1596,16 @@
 rce%7D.%0A *
- 
 %0A * @aut
@@ -1663,16 +1663,22 @@
 ingBean(
+value=
 MessageS
@@ -1688,16 +1688,47 @@
 ce.class
+, search=SearchStrategy.CURRENT
 )%0A@Order
@@ -2289,18 +2289,16 @@
 eSource%0A
-%09%09
 %09%09%09.setB

Add search=CURRENT to MessageSourceAutoConfiguration