root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-05-02 16:13:31 +02:00
parent 7879b38615 ed594d7706
commit eab2d4a404
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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