Merge pull request #2479 from linead/master

* pull2479:
  Supported relaxed binding on inner classes

Author: philwebb

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

@@ -286,12 +286,38 @@ private void extendMapIfNecessary(BeanWrapper wrapper, BeanPath path, int index)
 	}
 
 	private String getActualPropertyName(BeanWrapper target, String prefix, String name) {
-		prefix = StringUtils.hasText(prefix) ? prefix + "." : "";
+		String propertyName = resolvePropertyName(target, prefix, name);
+		if (propertyName == null) {
+			propertyName = resolveNestedPropertyName(target, prefix, name);
+		}
+		return (propertyName == null ? name : propertyName);
+	}
+
+	private String resolveNestedPropertyName(BeanWrapper target, String prefix,
+			String name) {
+		StringBuilder candidate = new StringBuilder();
+		for (String field : name.split("[_\\-\\.]")) {
+			candidate.append(candidate.length() > 0 ? "." : "");
+			candidate.append(field);
+			String nested = resolvePropertyName(target, prefix, candidate.toString());
+			if (nested != null) {
+				String propertyName = resolvePropertyName(target,
+						joinString(prefix, nested),
+						name.substring(candidate.length() + 1));
+				if (propertyName != null) {
+					return joinString(nested, propertyName);
+				}
+			}
+		}
+		return null;
+	}
+
+	private String resolvePropertyName(BeanWrapper target, String prefix, String name) {
 		Iterable<String> names = getNameAndAliases(name);
 		for (String nameOrAlias : names) {
 			for (String candidate : new RelaxedNames(nameOrAlias)) {
 				try {
-					if (target.getPropertyType(prefix + candidate) != null) {
+					if (target.getPropertyType(joinString(prefix, candidate)) != null) {
 						return candidate;
 					}
 				}
@@ -300,7 +326,11 @@ private String getActualPropertyName(BeanWrapper target, String prefix, String n
 				}
 			}
 		}
-		return name;
+		return null;
+	}
+
+	private String joinString(String prefix, String name) {
+		return (StringUtils.hasLength(prefix) ? prefix + "." + name : name);
 	}
 
 	private Iterable<String> getNameAndAliases(String name) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 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.
@@ -201,6 +201,22 @@ public void testBindNested() throws Exception {
 		assertEquals(123, target.getNested().getValue());
 	}
 
+	@Test
+	public void testBindRelaxedNestedValue() throws Exception {
+		TargetWithNestedObject target = new TargetWithNestedObject();
+		bind(target, "nested_foo_Baz: bar\n" + "nested_value: 123");
+		assertEquals("bar", target.getNested().getFooBaz());
+		assertEquals(123, target.getNested().getValue());
+	}
+
+	@Test
+	public void testBindRelaxedNestedCamelValue() throws Exception {
+		TargetWithNestedObject target = new TargetWithNestedObject();
+		bind(target, "another_nested_foo_Baz: bar\n" + "another-nested_value: 123");
+		assertEquals("bar", target.getAnotherNested().getFooBaz());
+		assertEquals(123, target.getAnotherNested().getValue());
+	}
+
 	@Test
 	public void testBindNestedWithEnviromentStyle() throws Exception {
 		TargetWithNestedObject target = new TargetWithNestedObject();
@@ -736,15 +752,27 @@ public void setNested(Set<String> nested) {
 	}
 
 	public static class TargetWithNestedObject {
+
 		private VanillaTarget nested;
 
+		private VanillaTarget anotherNested;
+
 		public VanillaTarget getNested() {
 			return this.nested;
 		}
 
 		public void setNested(VanillaTarget nested) {
 			this.nested = nested;
 		}
+
+		public VanillaTarget getAnotherNested() {
+			return this.anotherNested;
+		}
+
+		public void setAnotherNested(VanillaTarget anotherNested) {
+			this.anotherNested = anotherNested;
+		}
+
 	}
 
 	public static class VanillaTarget {