Fix NPE for component name after FactoryBeans

SO: https://stackoverflow.com/questions/62190244/spring-integration-upgrade-from-5-2-x-to-5-3-problem

When the component is populated to the application context via `FactoryBean`,
all its `BeanFactory` callbacks should be propagated from that `FactoryBean` -
only lifecycle control for this component we have through its `FactoryBean`

**Cherry-pick to 5.3.x**
This commit is contained in:
artembilan
2020-06-09 10:44:23 -04:00
committed by Gary Russell
parent 6e78569c00
commit b436cbecc5
4 changed files with 27 additions and 75 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.Comparator;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.integration.file.DirectoryScanner;
import org.springframework.integration.file.FileReadingMessageSource;
@@ -37,7 +38,8 @@ import org.springframework.util.Assert;
*
* @since 1.0.3
*/
public class FileReadingMessageSourceFactoryBean extends AbstractFactoryBean<FileReadingMessageSource> {
public class FileReadingMessageSourceFactoryBean extends AbstractFactoryBean<FileReadingMessageSource>
implements BeanNameAware {
private FileReadingMessageSource source;
@@ -61,6 +63,13 @@ public class FileReadingMessageSourceFactoryBean extends AbstractFactoryBean<Fil
private Integer queueSize;
private String name;
@Override
public void setBeanName(String name) {
this.name = name;
}
public void setDirectory(File directory) {
this.directory = directory;
}
@@ -154,6 +163,7 @@ public class FileReadingMessageSourceFactoryBean extends AbstractFactoryBean<Fil
if (beanFactory != null) {
this.source.setBeanFactory(beanFactory);
}
this.source.setBeanName(this.name);
this.source.afterPropertiesSet();
}