Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish Javadoc and inline comments

Browse Source 
Closes gh-28426
This commit is contained in:
CharlieYu
2022-05-10 02:26:06 +08:00
committed by GitHub
parent 5f8a4bcdc5
commit 432fce9db3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
View File

@@ -587,7 +587,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
// Attempt to predict the bean type
Class<?> predictedType = null;
// We're looking for a regular reference but we're a factory bean that has
// We're looking for a regular reference, but we're a factory bean that has
// a decorated bean definition. The target bean should be the same type
// as FactoryBean would ultimately return.
if (!isFactoryDereference && dbd != null && isFactoryBean(beanName, mbd)) {
@@ -625,7 +625,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
}
else if (isFactoryDereference) {
// Special case: A SmartInstantiationAwareBeanPostProcessor returned a non-FactoryBean
// type but we nevertheless are being asked to dereference a FactoryBean...
// type, but we nevertheless are being asked to dereference a FactoryBean...
// Let's check the original bean class and proceed with it if it is a FactoryBean.
predictedType = predictBeanType(beanName, mbd, FactoryBean.class);
if (predictedType == null || !FactoryBean.class.isAssignableFrom(predictedType)) {

4
spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
View File

@@ -169,7 +169,7 @@ public @interface ContextConfiguration {
Class<? extends ApplicationContextInitializer<?>>[] initializers() default {};
/**
* Whether or not {@linkplain #locations resource locations} or
* Whether {@linkplain #locations resource locations} or
* {@linkplain #classes <em>component classes</em>} from test superclasses
* should be <em>inherited</em>.
* <p>The default value is {@code true}. This means that an annotated test
@@ -224,7 +224,7 @@ public @interface ContextConfiguration {
boolean inheritLocations() default true;
/**
* Whether or not {@linkplain #initializers context initializers} from test
* Whether {@linkplain #initializers context initializers} from test
* superclasses should be <em>inherited</em>.
* <p>The default value is {@code true}. This means that an annotated test
* class will <em>inherit</em> the application context initializers defined