Skip to content

Commit 432fce9

Browse files
authored
Polish Javadoc and inline comments
Closes gh-28426
1 parent 5f8a4bc commit 432fce9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ else if (containsSingleton(beanName) && !containsBeanDefinition(beanName)) {
587587
// Attempt to predict the bean type
588588
Class<?> predictedType = null;
589589

590-
// We're looking for a regular reference but we're a factory bean that has
590+
// We're looking for a regular reference, but we're a factory bean that has
591591
// a decorated bean definition. The target bean should be the same type
592592
// as FactoryBean would ultimately return.
593593
if (!isFactoryDereference && dbd != null && isFactoryBean(beanName, mbd)) {
@@ -625,7 +625,7 @@ else if (containsSingleton(beanName) && !containsBeanDefinition(beanName)) {
625625
}
626626
else if (isFactoryDereference) {
627627
// Special case: A SmartInstantiationAwareBeanPostProcessor returned a non-FactoryBean
628-
// type but we nevertheless are being asked to dereference a FactoryBean...
628+
// type, but we nevertheless are being asked to dereference a FactoryBean...
629629
// Let's check the original bean class and proceed with it if it is a FactoryBean.
630630
predictedType = predictBeanType(beanName, mbd, FactoryBean.class);
631631
if (predictedType == null || !FactoryBean.class.isAssignableFrom(predictedType)) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
Class<? extends ApplicationContextInitializer<?>>[] initializers() default {};
170170

171171
/**
172-
* Whether or not {@linkplain #locations resource locations} or
172+
* Whether {@linkplain #locations resource locations} or
173173
* {@linkplain #classes <em>component classes</em>} from test superclasses
174174
* should be <em>inherited</em>.
175175
* <p>The default value is {@code true}. This means that an annotated test
@@ -224,7 +224,7 @@
224224
boolean inheritLocations() default true;
225225

226226
/**
227-
* Whether or not {@linkplain #initializers context initializers} from test
227+
* Whether {@linkplain #initializers context initializers} from test
228228
* superclasses should be <em>inherited</em>.
229229
* <p>The default value is {@code true}. This means that an annotated test
230230
* class will <em>inherit</em> the application context initializers defined

0 commit comments

Comments
 (0)