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

Protect against NPE with Option.IGNORE_IMPORTS 

Update `ConfigDataEnvironmentContributor` to deal with the fact that
the `properties` instance can be `null`.

Fixes gh-25029
This commit is contained in:
Phillip Webb 2021-01-27 14:17:41 -08:00
parent 7f32fa6723
commit 0fcc52ccaf
2 changed files with 13 additions and 1 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/config/ConfigDataEnvironmentContributor.java
View File

@ -223,7 +223,7 @@ class ConfigDataEnvironmentContributor implements Iterable<ConfigDataEnvironment
ConfigDataEnvironmentContributor withBoundProperties(Binder binder) { ConfigDataEnvironmentContributor withBoundProperties(Binder binder) {
UseLegacyConfigProcessingException.throwIfRequested(binder); UseLegacyConfigProcessingException.throwIfRequested(binder);
ConfigDataProperties properties = ConfigDataProperties.get(binder); ConfigDataProperties properties = ConfigDataProperties.get(binder);
if (this.configDataOptions.contains(ConfigData.Option.IGNORE_IMPORTS)) { if (properties != null && this.configDataOptions.contains(ConfigData.Option.IGNORE_IMPORTS)) {
properties = properties.withoutImports(); properties = properties.withoutImports();
} }
return new ConfigDataEnvironmentContributor(Kind.BOUND_IMPORT, this.location, this.resource, return new ConfigDataEnvironmentContributor(Kind.BOUND_IMPORT, this.location, this.resource,

12
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributorTests.java
View File

@ -26,6 +26,7 @@ import java.util.stream.Stream;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.cloud.CloudPlatform; import org.springframework.boot.cloud.CloudPlatform;
import org.springframework.boot.context.config.ConfigData.Option;
import org.springframework.boot.context.config.ConfigDataEnvironmentContributor.ImportPhase; import org.springframework.boot.context.config.ConfigDataEnvironmentContributor.ImportPhase;
import org.springframework.boot.context.config.ConfigDataEnvironmentContributor.Kind; import org.springframework.boot.context.config.ConfigDataEnvironmentContributor.Kind;
import org.springframework.boot.context.properties.bind.Binder; import org.springframework.boot.context.properties.bind.Binder;
@ -334,6 +335,17 @@ class ConfigDataEnvironmentContributorTests {
() -> createBoundContributor(null, new ConfigData(Collections.singleton(propertySource)), 0)); () -> createBoundContributor(null, new ConfigData(Collections.singleton(propertySource)), 0));
} }
@Test // gh-25029
void withBoundPropertiesWhenIgnoringImportsAndNothingBound() {
TestResource resource = new TestResource("a");
ConfigData configData = new ConfigData(Collections.singleton(new MockPropertySource()), Option.IGNORE_IMPORTS);
ConfigDataEnvironmentContributor contributor = ConfigDataEnvironmentContributor.ofUnboundImport(TEST_LOCATION,
resource, false, configData, 0);
Binder binder = new Binder(contributor.getConfigurationPropertySource());
ConfigDataEnvironmentContributor bound = contributor.withBoundProperties(binder);
assertThat(bound).isNotNull();
}
private ConfigDataEnvironmentContributor createBoundContributor(String location) { private ConfigDataEnvironmentContributor createBoundContributor(String location) {
return createBoundContributor(new TestResource(location), return createBoundContributor(new TestResource(location),
new ConfigData(Collections.singleton(new MockPropertySource())), 0); new ConfigData(Collections.singleton(new MockPropertySource())), 0);