Use ImportBeanDefintionRegistrar directly instead of import selector
Closes gh-16679pull/16684/head
Madhura Bhave
6 years ago
parent
01abaa70f7
commit
a0d425332d
@ -0,0 +1,60 @@
|
||||
/*
|
||||
* Copyright 2012-2019 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.properties;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
|
||||
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
|
||||
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
|
||||
import org.springframework.core.type.AnnotationMetadata;
|
||||
import org.springframework.util.MultiValueMap;
|
||||
|
||||
/**
|
||||
* {@link ImportBeanDefinitionRegistrar} for configuration properties support.
|
||||
*
|
||||
* @author Dave Syer
|
||||
* @author Christian Dupuis
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
class ConfigurationPropertiesBeanRegistrar implements ImportBeanDefinitionRegistrar {
|
||||
|
||||
@Override
|
||||
public void registerBeanDefinitions(AnnotationMetadata metadata,
|
||||
BeanDefinitionRegistry registry) {
|
||||
ConfigurableListableBeanFactory beanFactory = (ConfigurableListableBeanFactory) registry;
|
||||
getTypes(metadata)
|
||||
.forEach((type) -> ConfigurationPropertiesBeanDefinitionRegistrar
|
||||
.register(registry, beanFactory, type));
|
||||
}
|
||||
|
||||
private List<Class<?>> getTypes(AnnotationMetadata metadata) {
|
||||
MultiValueMap<String, Object> attributes = metadata.getAllAnnotationAttributes(
|
||||
EnableConfigurationProperties.class.getName(), false);
|
||||
return collectClasses(
|
||||
(attributes != null) ? attributes.get("value") : Collections.emptyList());
|
||||
}
|
||||
|
||||
private List<Class<?>> collectClasses(List<?> values) {
|
||||
return values.stream().flatMap((value) -> Arrays.stream((Class<?>[]) value))
|
||||
.filter((type) -> void.class != type).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,86 +0,0 @@
|
||||
/*
|
||||
* Copyright 2012-2019 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.properties;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
|
||||
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
|
||||
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
|
||||
import org.springframework.context.annotation.ImportSelector;
|
||||
import org.springframework.core.type.AnnotationMetadata;
|
||||
import org.springframework.util.MultiValueMap;
|
||||
|
||||
/**
|
||||
* Import selector that sets up binding of external properties to configuration classes
|
||||
* (see {@link ConfigurationProperties}). It either registers a
|
||||
* {@link ConfigurationProperties} bean or not, depending on whether the enclosing
|
||||
* {@link EnableConfigurationProperties} explicitly declares one. If none is declared then
|
||||
* a bean post processor will still kick in for any beans annotated as external
|
||||
* configuration. If one is declared, then a bean definition is registered with id equal
|
||||
* to the class name (thus an application context usually only contains one
|
||||
* {@link ConfigurationProperties} bean of each unique type).
|
||||
*
|
||||
* @author Dave Syer
|
||||
* @author Christian Dupuis
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
class EnableConfigurationPropertiesImportSelector implements ImportSelector {
|
||||
|
||||
private static final String[] IMPORTS = {
|
||||
ConfigurationPropertiesBeanRegistrar.class.getName(),
|
||||
ConfigurationPropertiesBindingPostProcessorRegistrar.class.getName() };
|
||||
|
||||
@Override
|
||||
public String[] selectImports(AnnotationMetadata metadata) {
|
||||
return IMPORTS;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@link ImportBeanDefinitionRegistrar} for configuration properties support.
|
||||
*/
|
||||
public static class ConfigurationPropertiesBeanRegistrar
|
||||
implements ImportBeanDefinitionRegistrar {
|
||||
|
||||
@Override
|
||||
public void registerBeanDefinitions(AnnotationMetadata metadata,
|
||||
BeanDefinitionRegistry registry) {
|
||||
ConfigurableListableBeanFactory beanFactory = (ConfigurableListableBeanFactory) registry;
|
||||
getTypes(metadata)
|
||||
.forEach((type) -> ConfigurationPropertiesBeanDefinitionRegistrar
|
||||
.register(registry, beanFactory, type));
|
||||
}
|
||||
|
||||
private List<Class<?>> getTypes(AnnotationMetadata metadata) {
|
||||
MultiValueMap<String, Object> attributes = metadata
|
||||
.getAllAnnotationAttributes(
|
||||
EnableConfigurationProperties.class.getName(), false);
|
||||
return collectClasses((attributes != null) ? attributes.get("value")
|
||||
: Collections.emptyList());
|
||||
}
|
||||
|
||||
private List<Class<?>> collectClasses(List<?> values) {
|
||||
return values.stream().flatMap((value) -> Arrays.stream((Class<?>[]) value))
|
||||
.filter((type) -> void.class != type).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue