pull/16322/head
Stephane Nicoll 6 years ago
parent 2225b36299
commit 197e1669e2

@ -53,10 +53,10 @@ import org.springframework.core.annotation.AliasFor;
@Inherited @Inherited
@SpringBootConfiguration @SpringBootConfiguration
@EnableAutoConfiguration @EnableAutoConfiguration
@ConfigurationPropertiesScan
@ComponentScan(excludeFilters = { @ComponentScan(excludeFilters = {
@Filter(type = FilterType.CUSTOM, classes = TypeExcludeFilter.class), @Filter(type = FilterType.CUSTOM, classes = TypeExcludeFilter.class),
@Filter(type = FilterType.CUSTOM, classes = AutoConfigurationExcludeFilter.class) }) @Filter(type = FilterType.CUSTOM, classes = AutoConfigurationExcludeFilter.class) })
@ConfigurationPropertiesScan
public @interface SpringBootApplication { public @interface SpringBootApplication {
/** /**

@ -39,11 +39,11 @@ import org.springframework.util.StringUtils;
*/ */
final class ConfigurationPropertiesBeanDefinitionRegistrar { final class ConfigurationPropertiesBeanDefinitionRegistrar {
private static final boolean KOTLIN_PRESENT = KotlinDetector.isKotlinPresent();
private ConfigurationPropertiesBeanDefinitionRegistrar() { private ConfigurationPropertiesBeanDefinitionRegistrar() {
} }
private static final boolean KOTLIN_PRESENT = KotlinDetector.isKotlinPresent();
public static void register(BeanDefinitionRegistry registry, public static void register(BeanDefinitionRegistry registry,
ConfigurableListableBeanFactory beanFactory, Class<?> type) { ConfigurableListableBeanFactory beanFactory, Class<?> type) {
String name = getName(type); String name = getName(type);

@ -33,7 +33,6 @@ import org.springframework.core.annotation.AliasFor;
* *
* @author Madhura Bhave * @author Madhura Bhave
* @since 2.2.0 * @since 2.2.0
* @see ConfigurationPropertiesScanRegistrar
*/ */
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2018 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

Loading…
Cancel
Save