Merge branch '1.1.x'

Author: dsyer

spring-boot-cli/src/main/executablecontent/bin/spring

@@ -69,7 +69,7 @@ if [ -z "${SPRING_HOME}" ]; then
     done
     SAVED="`pwd`"
     cd "`dirname \"$PRG\"`/../" >&-
-    SPRING_HOME="`pwd -P`"
+    export SPRING_HOME="`pwd -P`"
     cd "$SAVED" >&-
 fi
 

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

@@ -28,6 +28,7 @@
 import org.springframework.beans.InvalidPropertyException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;
+import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.DataBinder;
@@ -47,6 +48,8 @@ public class RelaxedDataBinder extends DataBinder {
 
 	private boolean ignoreNestedProperties;
 
+	private ConversionService relaxedConversionService;
+
 	/**
 	 * Create a new {@link RelaxedDataBinder} instance.
 	 * @param target the target into which properties are bound
@@ -76,12 +79,19 @@ public void setIgnoreNestedProperties(boolean ignoreNestedProperties) {
 		this.ignoreNestedProperties = ignoreNestedProperties;
 	}
 
+	@Override
+	public void setConversionService(ConversionService conversionService) {
+		super.setConversionService(conversionService);
+		this.relaxedConversionService = new RelaxedConversionService(getConversionService());
+	}
+
 	@Override
 	public void initBeanPropertyAccess() {
 		super.initBeanPropertyAccess();
+		this.relaxedConversionService = (this.relaxedConversionService != null
+				?  this.relaxedConversionService : new RelaxedConversionService(getConversionService()));
 		// Hook in the RelaxedConversionService
-		getInternalBindingResult().initConversion(
-				new RelaxedConversionService(getConversionService()));
+		getInternalBindingResult().initConversion(relaxedConversionService);
 	}
 
 	@Override
@@ -111,6 +121,7 @@ private MutablePropertyValues modifyProperties(MutablePropertyValues propertyVal
 		}
 
 		BeanWrapper targetWrapper = new BeanWrapperImpl(target);
+		targetWrapper.setConversionService(this.relaxedConversionService);
 		targetWrapper.setAutoGrowNestedPaths(true);
 
 		List<PropertyValue> list = propertyValues.getPropertyValueList();
@@ -189,7 +200,6 @@ private String initializePath(BeanWrapper wrapper, BeanPath path, int index) {
 		TypeDescriptor descriptor = wrapper.getPropertyTypeDescriptor(name);
 		if (descriptor == null || descriptor.isMap()) {
 			if (descriptor != null) {
-				wrapper.getPropertyValue(name + "[foo]");
 				TypeDescriptor valueDescriptor = descriptor.getMapValueTypeDescriptor();
 				if (valueDescriptor != null) {
 					Class<?> valueType = valueDescriptor.getObjectType();

spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java

@@ -284,6 +284,15 @@ public void testBindNestedMapOfString() throws Exception {
 		assertEquals("123", target.getNested().get("value.foo"));
 	}
 
+	@Test
+	public void testBindNestedMapOfEnum() throws Exception {
+		this.conversionService = new DefaultConversionService();
+		TargetWithNestedMapOfEnum target = new TargetWithNestedMapOfEnum();
+		bind(target, "nested.this: bar\n" + "nested.ThAt: 123");
+		assertEquals("bar", target.getNested().get(Bingo.THIS));
+		assertEquals("123", target.getNested().get(Bingo.THAT));
+	}
+
 	@Test
 	public void testBindNestedMapBracketReferenced() throws Exception {
 		TargetWithNestedMap target = new TargetWithNestedMap();
@@ -578,6 +587,19 @@ public void setNested(Map<String, String> nested) {
 
 	}
 
+	public static class TargetWithNestedMapOfEnum {
+
+		private Map<Bingo, Object> nested;
+
+		public Map<Bingo, Object> getNested() {
+			return nested;
+		}
+
+		public void setNested(Map<Bingo, Object> nested) {
+			this.nested = nested;
+		}
+	}
+
 	public static class TargetWithNestedMapOfListOfString {
 
 		private Map<String, List<String>> nested;