Merge branch '1.1.x'

spring-boot/src/main/java/org/springframework/boot/bind/RelaxedConversionService.java

@@ -49,6 +49,7 @@ class RelaxedConversionService implements ConversionService {
 		this.additionalConverters = new GenericConversionService();
 		this.additionalConverters
 				.addConverterFactory(new StringToEnumIgnoringCaseConverterFactory());
+		this.additionalConverters.addConverter(new StringToCharArrayConverter());
 	}
 
 	@Override

spring-boot/src/main/java/org/springframework/boot/bind/StringToCharArrayConverter.java

@@ -0,0 +1,33 @@
+/*
+ * 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.bind;
+
+import org.springframework.core.convert.converter.Converter;
+
+/**
+ * Converts a String to a Char Array.
+ *
+ * @author Phillip Webb
+ */
+class StringToCharArrayConverter implements Converter<String, char[]> {
+
+	@Override
+	public char[] convert(String source) {
+		return source.toCharArray();
+	}
+
+}

spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java

@@ -188,6 +188,16 @@ public class ConfigurationPropertiesBindingPostProcessorTests {
 		assertTrue("No init", ConfigurationPropertiesWithFactoryBean.factoryBeanInit);
 	}
 
+	@Test
+	public void configurationPropertiesWithCharArray() throws Exception {
+		this.context = new AnnotationConfigApplicationContext();
+		EnvironmentTestUtils.addEnvironment(this.context, "test.chars:word");
+		this.context.register(PropertyWithCharArray.class);
+		this.context.refresh();
+		assertThat(this.context.getBean(PropertyWithCharArray.class).getChars(),
+				equalTo("word".toCharArray()));
+	}
+
 	@Configuration
 	@EnableConfigurationProperties
 	public static class TestConfigurationWithValidatingSetter {
@@ -302,6 +312,23 @@ public class ConfigurationPropertiesBindingPostProcessorTests {
 
 	}
 
+	@Configuration
+	@EnableConfigurationProperties
+	@ConfigurationProperties(prefix = "test")
+	public static class PropertyWithCharArray {
+
+		private char[] chars;
+
+		public char[] getChars() {
+			return this.chars;
+		}
+
+		public void setChars(char[] chars) {
+			this.chars = chars;
+		}
+
+	}
+
 	@Configuration
 	@EnableConfigurationProperties
 	@ConfigurationProperties(prefix = "test")