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

Consistent nullability for BeanDefinitionBuilder setters

Browse Source 
Issue: SPR-15841
This commit is contained in:
Juergen Hoeller
2017-08-08 17:26:45 +02:00
parent de09f8ca1f
commit 09f5c71374
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
View File

@@ -194,7 +194,7 @@ public class BeanDefinitionBuilder {
* Add an indexed constructor arg value. The current index is tracked internally
* and all additions are at the present point.
*/
public BeanDefinitionBuilder addConstructorArgValue(Object value) {
public BeanDefinitionBuilder addConstructorArgValue(@Nullable Object value) {
this.beanDefinition.getConstructorArgumentValues().addIndexedArgumentValue(
this.constructorArgIndex++, value);
return this;
@@ -213,7 +213,7 @@ public class BeanDefinitionBuilder {
/**
* Add the supplied property value under the given name.
*/
public BeanDefinitionBuilder addPropertyValue(String name, Object value) {
public BeanDefinitionBuilder addPropertyValue(String name, @Nullable Object value) {
this.beanDefinition.getPropertyValues().add(name, value);
return this;
}
@@ -231,7 +231,7 @@ public class BeanDefinitionBuilder {
/**
* Set the init method for this definition.
*/
public BeanDefinitionBuilder setInitMethodName(String methodName) {
public BeanDefinitionBuilder setInitMethodName(@Nullable String methodName) {
this.beanDefinition.setInitMethodName(methodName);
return this;
}
@@ -239,7 +239,7 @@ public class BeanDefinitionBuilder {
/**
* Set the destroy method for this definition.
*/
public BeanDefinitionBuilder setDestroyMethodName(String methodName) {
public BeanDefinitionBuilder setDestroyMethodName(@Nullable String methodName) {
this.beanDefinition.setDestroyMethodName(methodName);
return this;
}
@@ -250,7 +250,7 @@ public class BeanDefinitionBuilder {
* @see org.springframework.beans.factory.config.BeanDefinition#SCOPE_SINGLETON
* @see org.springframework.beans.factory.config.BeanDefinition#SCOPE_PROTOTYPE
*/
public BeanDefinitionBuilder setScope(String scope) {
public BeanDefinitionBuilder setScope(@Nullable String scope) {
this.beanDefinition.setScope(scope);
return this;
}

5
spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java
View File

@@ -79,10 +79,7 @@ public abstract class AbstractSingleBeanDefinitionParser extends AbstractBeanDef
BeanDefinition containingBd = parserContext.getContainingBeanDefinition();
if (containingBd != null) {
// Inner bean definition must receive same scope as containing bean.
String scopeName = containingBd.getScope();
if (scopeName != null) {
builder.setScope(scopeName);
}
builder.setScope(containingBd.getScope());
}
if (parserContext.isDefaultLazyInit()) {
// Default-lazy-init applies to custom bean definitions as well.