Merge branch '2.0.x'

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/handler/IgnoreTopLevelConverterNotFoundBindHandler.java

@@ -28,7 +28,7 @@ import org.springframework.core.convert.ConverterNotFoundException;
  * {@link ConverterNotFoundException}s.
  *
  * @author Madhura Bhave
- * @since 2.0.0
+ * @since 2.0.1
  */
 public class IgnoreTopLevelConverterNotFoundBindHandler extends AbstractBindHandler {
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/IgnoreTopLevelConverterNotFoundBindHandlerTests.java

@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -57,11 +56,6 @@ public class IgnoreTopLevelConverterNotFoundBindHandlerTests {
 		this.binder = new Binder(this.sources);
 	}
 
-	@After
-	public void tearDown() {
-		this.sources.clear();
-	}
-
 	@Test
 	public void bindWhenHandlerNotPresentShouldFail() {
 		this.thrown.expectCause(instanceOf(ConverterNotFoundException.class));
@@ -75,7 +69,7 @@ public class IgnoreTopLevelConverterNotFoundBindHandlerTests {
 	}
 
 	@Test
-	public void bindWhenExceptionNotIgnorableShouldNotFail() {
+	public void bindWhenExceptionNotIgnorableShouldFail() {
 		MockConfigurationPropertySource source = new MockConfigurationPropertySource();
 		source.put("example.foo", "1");
 		this.sources.add(source);