mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Assert that sources does not contain null elements
See gh-30878
This commit is contained in:
parent
94c9388861
commit
ebf276c005
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2021 the original author or authors.
|
||||
* Copyright 2012-2022 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.
|
||||
@ -72,7 +72,7 @@ public class Binder {
|
||||
* @param sources the sources used for binding
|
||||
*/
|
||||
public Binder(ConfigurationPropertySource... sources) {
|
||||
this(Arrays.asList(sources), null, null, null);
|
||||
this((sources != null) ? Arrays.asList(sources) : null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -182,6 +182,7 @@ public class Binder {
|
||||
List<ConversionService> conversionServices, Consumer<PropertyEditorRegistry> propertyEditorInitializer,
|
||||
BindHandler defaultBindHandler, BindConstructorProvider constructorProvider) {
|
||||
Assert.notNull(sources, "Sources must not be null");
|
||||
sources.forEach((source) -> Assert.notNull(source, "Sources cannot contain null values"));
|
||||
this.sources = sources;
|
||||
this.placeholdersResolver = (placeholdersResolver != null) ? placeholdersResolver : PlaceholdersResolver.NONE;
|
||||
this.bindConverter = BindConverter.get(conversionServices, propertyEditorInitializer);
|
||||
|
@ -71,10 +71,20 @@ class BinderTests {
|
||||
|
||||
@Test
|
||||
void createWhenSourcesIsNullShouldThrowException() {
|
||||
assertThatIllegalArgumentException().isThrownBy(() -> new Binder((ConfigurationPropertySource[]) null))
|
||||
.withMessageContaining("Sources must not be null");
|
||||
assertThatIllegalArgumentException().isThrownBy(() -> new Binder((Iterable<ConfigurationPropertySource>) null))
|
||||
.withMessageContaining("Sources must not be null");
|
||||
}
|
||||
|
||||
@Test
|
||||
void createWhenSourcesContainNullValuesShouldThrowException() {
|
||||
assertThatIllegalArgumentException().isThrownBy(() -> new Binder(new ConfigurationPropertySource[] { null }))
|
||||
.withMessageContaining("Sources cannot contain null values");
|
||||
assertThatIllegalArgumentException().isThrownBy(() -> new Binder(Collections.singletonList(null)))
|
||||
.withMessageContaining("Sources cannot contain null values");
|
||||
}
|
||||
|
||||
@Test
|
||||
void bindWhenNameIsNullShouldThrowException() {
|
||||
assertThatIllegalArgumentException().isThrownBy(() -> this.binder.bind((ConfigurationPropertyName) null,
|
||||
|
Loading…
Reference in New Issue
Block a user