From 4af94dfc5d339733d878f6f1f52404035305bc28 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 13 May 2019 18:03:12 +0200 Subject: [PATCH] Clarify AbstractBeanDefinition.getBeanClass() return semantics Closes gh-22960 --- .../factory/support/AbstractBeanDefinition.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java index c64b1a7ee2..f28218afd8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java @@ -397,10 +397,13 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess } /** - * Return the class of the wrapped bean, if already resolved. - * @return the bean class, or {@code null} if none defined + * Return the class of the wrapped bean (assuming it is resolved already). + * @return the bean class (never {@code null}) * @throws IllegalStateException if the bean definition does not define a bean class, - * or a specified bean class name has not been resolved into an actual Class + * or a specified bean class name has not been resolved into an actual Class yet + * @see #hasBeanClass() + * @see #setBeanClass(Class) + * @see #resolveBeanClass(ClassLoader) */ public Class getBeanClass() throws IllegalStateException { Object beanClassObject = this.beanClass; @@ -416,6 +419,9 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess /** * Return whether this definition specifies a bean class. + * @see #getBeanClass() + * @see #setBeanClass(Class) + * @see #resolveBeanClass(ClassLoader) */ public boolean hasBeanClass() { return (this.beanClass instanceof Class);