Skip to content

Commit 322b0f4

Browse files
committed
Javadoc update: ConfigurationClassPostProcessor is priority-ordered
Issue: SPR-17062 (cherry picked from commit c66f9d8)
1 parent 1ff1c95 commit 322b0f4

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -64,7 +64,7 @@
6464
import org.springframework.util.Assert;
6565
import org.springframework.util.ClassUtils;
6666

67-
import static org.springframework.context.annotation.AnnotationConfigUtils.*;
67+
import static org.springframework.context.annotation.AnnotationConfigUtils.CONFIGURATION_BEAN_NAME_GENERATOR;
6868

6969
/**
7070
* {@link BeanFactoryPostProcessor} used for bootstrapping processing of
@@ -74,10 +74,10 @@
7474
* {@code <context:component-scan/>}. Otherwise, may be declared manually as
7575
* with any other BeanFactoryPostProcessor.
7676
*
77-
* <p>This post processor is {@link Ordered#HIGHEST_PRECEDENCE} as it is important
78-
* that any {@link Bean} methods declared in Configuration classes have their
79-
* respective bean definitions registered before any other BeanFactoryPostProcessor
80-
* executes.
77+
* <p>This post processor is priority-ordered as it is important that any
78+
* {@link Bean} methods declared in {@code @Configuration} classes have
79+
* their corresponding bean definitions registered before any other
80+
* {@link BeanFactoryPostProcessor} executes.
8181
*
8282
* @author Chris Beams
8383
* @author Juergen Hoeller
@@ -115,10 +115,10 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
115115

116116
private boolean localBeanNameGeneratorSet = false;
117117

118-
/* using short class names as default bean names */
118+
/* Using short class names as default bean names */
119119
private BeanNameGenerator componentScanBeanNameGenerator = new AnnotationBeanNameGenerator();
120120

121-
/* using fully qualified class names as default bean names */
121+
/* Using fully qualified class names as default bean names */
122122
private BeanNameGenerator importBeanNameGenerator = new AnnotationBeanNameGenerator() {
123123
@Override
124124
protected String buildDefaultBeanName(BeanDefinition definition) {
@@ -382,6 +382,7 @@ else if (logger.isWarnEnabled() && beanFactory.containsSingleton(beanName)) {
382382
// nothing to enhance -> return immediately
383383
return;
384384
}
385+
385386
ConfigurationClassEnhancer enhancer = new ConfigurationClassEnhancer();
386387
for (Map.Entry<String, AbstractBeanDefinition> entry : configBeanDefs.entrySet()) {
387388
AbstractBeanDefinition beanDef = entry.getValue();

0 commit comments

Comments
 (0)