|
|
|
@ -147,9 +147,8 @@ class ConfigurationClassParser { |
|
|
|
this.problemReporter = problemReporter; |
|
|
|
this.problemReporter = problemReporter; |
|
|
|
this.environment = environment; |
|
|
|
this.environment = environment; |
|
|
|
this.resourceLoader = resourceLoader; |
|
|
|
this.resourceLoader = resourceLoader; |
|
|
|
this.propertySourceRegistry = (this.environment instanceof ConfigurableEnvironment ce |
|
|
|
this.propertySourceRegistry = (this.environment instanceof ConfigurableEnvironment ce ? |
|
|
|
? new PropertySourceRegistry(new PropertySourceProcessor(ce, this.resourceLoader)) |
|
|
|
new PropertySourceRegistry(new PropertySourceProcessor(ce, this.resourceLoader)) : null); |
|
|
|
: null); |
|
|
|
|
|
|
|
this.registry = registry; |
|
|
|
this.registry = registry; |
|
|
|
this.componentScanParser = new ComponentScanAnnotationParser( |
|
|
|
this.componentScanParser = new ComponentScanAnnotationParser( |
|
|
|
environment, resourceLoader, componentScanBeanNameGenerator, registry); |
|
|
|
environment, resourceLoader, componentScanBeanNameGenerator, registry); |
|
|
|
|