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

Merge branch '2.3.x' 

Closes gh-22586
This commit is contained in:
Andy Wilkinson 2020-07-27 13:37:34 +01:00
parent d16838e4b7 8ff2b9f2e8
commit 1efac09913
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,15 @@ public class NoUnboundElementsBindHandler extends AbstractBindHandler {
return super.onSuccess(name, target, context, result); return super.onSuccess(name, target, context, result);
} }
@Override
public Object onFailure(ConfigurationPropertyName name, Bindable<?> target, BindContext context, Exception error)
throws Exception {
if (error instanceof UnboundConfigurationPropertiesException) {
throw error;
}
return super.onFailure(name, target, context, error);
}
@Override @Override
public void onFinish(ConfigurationPropertyName name, Bindable<?> target, BindContext context, Object result) public void onFinish(ConfigurationPropertyName name, Bindable<?> target, BindContext context, Object result)
throws Exception { throws Exception {

19
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
View File

@ -175,6 +175,14 @@ class ConfigurationPropertiesTests {
.withCauseInstanceOf(BindException.class); .withCauseInstanceOf(BindException.class);
} }
@Test
void givenIgnoreUnknownFieldsFalseAndIgnoreInvalidFieldsTrueWhenThereAreUnknownFieldsThenBindingShouldFail() {
removeSystemProperties();
assertThatExceptionOfType(ConfigurationPropertiesBindException.class).isThrownBy(
() -> load(IgnoreUnknownFieldsFalseIgnoreInvalidFieldsTrueConfiguration.class, "name=foo", "bar=baz"))
.withCauseInstanceOf(BindException.class);
}
@Test @Test
void loadWhenHasIgnoreInvalidFieldsTrueAndInvalidFieldsShouldBind() { void loadWhenHasIgnoreInvalidFieldsTrueAndInvalidFieldsShouldBind() {
load(IgnoreInvalidFieldsFalseProperties.class, "com.example.bar=spam"); load(IgnoreInvalidFieldsFalseProperties.class, "com.example.bar=spam");
@ -1000,6 +1008,12 @@ class ConfigurationPropertiesTests {
} }
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(IgnoreUnknownFieldsFalseIgnoreInvalidFieldsTrueProperties.class)
static class IgnoreUnknownFieldsFalseIgnoreInvalidFieldsTrueConfiguration {
}
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(PrefixProperties.class) @EnableConfigurationProperties(PrefixProperties.class)
static class PrefixConfiguration { static class PrefixConfiguration {
@ -1447,6 +1461,11 @@ class ConfigurationPropertiesTests {
} }
@ConfigurationProperties(ignoreUnknownFields = false, ignoreInvalidFields = true)
static class IgnoreUnknownFieldsFalseIgnoreInvalidFieldsTrueProperties extends BasicProperties {
}
@EnableConfigurationProperties @EnableConfigurationProperties
@ConfigurationProperties(prefix = "com.example", ignoreInvalidFields = true) @ConfigurationProperties(prefix = "com.example", ignoreInvalidFields = true)
static class IgnoreInvalidFieldsFalseProperties { static class IgnoreInvalidFieldsFalseProperties {