Merge branch '2.7.x'
Andy Wilkinson
3 years ago
commit
4bb5ba2bd0
@ -1,66 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2021 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.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.springframework.boot.context.config;
|
|
||||||
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
|
|
||||||
import org.springframework.core.env.ConfigurableEnvironment;
|
|
||||||
import org.springframework.core.env.MutablePropertySources;
|
|
||||||
import org.springframework.core.env.PropertySource;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Internal {@link PropertySource} implementation used by
|
|
||||||
* {@link ConfigFileApplicationListener} to filter out properties for specific operations.
|
|
||||||
*
|
|
||||||
* @author Phillip Webb
|
|
||||||
*/
|
|
||||||
class FilteredPropertySource extends PropertySource<PropertySource<?>> {
|
|
||||||
|
|
||||||
private final Set<String> filteredProperties;
|
|
||||||
|
|
||||||
FilteredPropertySource(PropertySource<?> original, Set<String> filteredProperties) {
|
|
||||||
super(original.getName(), original);
|
|
||||||
this.filteredProperties = filteredProperties;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object getProperty(String name) {
|
|
||||||
if (this.filteredProperties.contains(name)) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return getSource().getProperty(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void apply(ConfigurableEnvironment environment, String propertySourceName, Set<String> filteredProperties,
|
|
||||||
Consumer<PropertySource<?>> operation) {
|
|
||||||
MutablePropertySources propertySources = environment.getPropertySources();
|
|
||||||
PropertySource<?> original = propertySources.get(propertySourceName);
|
|
||||||
if (original == null) {
|
|
||||||
operation.accept(null);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
propertySources.replace(propertySourceName, new FilteredPropertySource(original, filteredProperties));
|
|
||||||
try {
|
|
||||||
operation.accept(original);
|
|
||||||
}
|
|
||||||
finally {
|
|
||||||
propertySources.replace(propertySourceName, original);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,103 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2021 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.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.springframework.boot.context.config;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
import org.springframework.core.env.ConfigurableEnvironment;
|
|
||||||
import org.springframework.core.env.MapPropertySource;
|
|
||||||
import org.springframework.core.env.PropertySource;
|
|
||||||
import org.springframework.mock.env.MockEnvironment;
|
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tests for {@link FilteredPropertySource}.
|
|
||||||
*
|
|
||||||
* @author Phillip Webb
|
|
||||||
*/
|
|
||||||
class FilteredPropertySourceTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void applyWhenHasNoSourceShouldRunOperation() {
|
|
||||||
ConfigurableEnvironment environment = new MockEnvironment();
|
|
||||||
TestOperation operation = new TestOperation();
|
|
||||||
FilteredPropertySource.apply(environment, "test", Collections.emptySet(), operation);
|
|
||||||
assertThat(operation.isCalled()).isTrue();
|
|
||||||
assertThat(operation.getOriginal()).isNull();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void applyWhenHasSourceShouldRunWithReplacedSource() {
|
|
||||||
ConfigurableEnvironment environment = new MockEnvironment();
|
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
|
||||||
map.put("regular", "regularValue");
|
|
||||||
map.put("filtered", "filteredValue");
|
|
||||||
PropertySource<?> propertySource = new MapPropertySource("test", map);
|
|
||||||
environment.getPropertySources().addFirst(propertySource);
|
|
||||||
TestOperation operation = new TestOperation(() -> {
|
|
||||||
assertThat(environment.containsProperty("regular")).isTrue();
|
|
||||||
assertThat(environment.containsProperty("filtered")).isFalse();
|
|
||||||
});
|
|
||||||
FilteredPropertySource.apply(environment, "test", Collections.singleton("filtered"), operation);
|
|
||||||
assertThat(operation.isCalled()).isTrue();
|
|
||||||
assertThat(operation.getOriginal()).isSameAs(propertySource);
|
|
||||||
assertThat(environment.getPropertySources().get("test")).isSameAs(propertySource);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
static class TestOperation implements Consumer<PropertySource<?>> {
|
|
||||||
|
|
||||||
private boolean called;
|
|
||||||
|
|
||||||
private PropertySource<?> original;
|
|
||||||
|
|
||||||
private Runnable operation;
|
|
||||||
|
|
||||||
TestOperation() {
|
|
||||||
this(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
TestOperation(Runnable operation) {
|
|
||||||
this.operation = operation;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void accept(PropertySource<?> original) {
|
|
||||||
this.called = true;
|
|
||||||
this.original = original;
|
|
||||||
if (this.operation != null) {
|
|
||||||
this.operation.run();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean isCalled() {
|
|
||||||
return this.called;
|
|
||||||
}
|
|
||||||
|
|
||||||
PropertySource<?> getOriginal() {
|
|
||||||
return this.original;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue