Skip to content

[2962] Mismatch between mechanism to check if nullChannel bean exists and mechanism to fetch that bean #2963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artembilan merged 2 commits into from
Jun 13, 2019
Merged

[2962] Mismatch between mechanism to check if nullChannel bean exists and mechanism to fetch that bean #2963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76e8ab1
fix for https://github.com/spring-projects/spring-integration/issues/…
Jun 11, 2019
fb3ecba
addressing code style removed comments and addressed review comments
Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions ...va/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@

import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.HierarchicalBeanFactory;
import org.springframework.beans.factory.SmartInitializingSingleton;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
Expand Down Expand Up @@ -83,6 +85,7 @@
* @author Oleg Zhurakousky
* @author Artem Bilan
* @author Gary Russell
* @author Michael Wiles
*
* @see IntegrationContextUtils
*/
Expand Down Expand Up @@ -172,18 +175,20 @@ private void registerMessagePublishingErrorHandler() {
private void registerNullChannel() {
if (this.beanFactory.containsBean(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)) {
BeanDefinition nullChannelDefinition = null;
if (this.beanFactory.containsBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)) {
nullChannelDefinition =
this.beanFactory.getBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME);
}
else {
BeanDefinitionRegistry parentBeanFactory =
(BeanDefinitionRegistry) this.beanFactory.getParentBeanFactory();
if (parentBeanFactory != null) {
nullChannelDefinition =
parentBeanFactory.getBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME);
BeanFactory beanFactory = this.beanFactory;
do {
if (beanFactory instanceof ConfigurableListableBeanFactory) {
ConfigurableListableBeanFactory listable = (ConfigurableListableBeanFactory) beanFactory;
if (listable.containsBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)) {
nullChannelDefinition = listable
.getBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME);
}
}
if (beanFactory instanceof HierarchicalBeanFactory) {
beanFactory = ((HierarchicalBeanFactory) beanFactory).getParentBeanFactory();
}
}
while (nullChannelDefinition == null);

if (nullChannelDefinition != null &&
!NullChannel.class.getName().equals(nullChannelDefinition.getBeanClassName())) {
Expand Down
32 changes: 32 additions & 0 deletions ...e/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
import org.springframework.integration.config.GlobalChannelInterceptor;
import org.springframework.integration.config.IntegrationConverter;
import org.springframework.integration.config.SpelFunctionFactoryBean;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.endpoint.AbstractEndpoint;
Expand Down Expand Up @@ -136,6 +137,7 @@
/**
* @author Artem Bilan
* @author Gary Russell
* @author Michael Wiles
*
* @since 4.0
*/
Expand Down Expand Up @@ -470,6 +472,36 @@ public void testMessagingGateway() throws InterruptedException {
assertThat(this.asyncAnnotationProcessThread.get()).isNotSameAs(Thread.currentThread());
}

/**
* Just creates an interim context to confirm that the
* DefaultConfiguringBeanFactoryPostProcessor does not fail when there is an extra
* application context in the hierarchy.
*/
@Test
public void testDoubleParentChildAnnotationConfiguration() {

assertThat(this.context.containsBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)).isTrue();

AnnotationConfigApplicationContext parent;
parent = new AnnotationConfigApplicationContext();
parent.register(ChildConfiguration.class);
parent.setParent(this.context);
parent.refresh();

assertThat(parent.containsBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)).isFalse();

AnnotationConfigApplicationContext child;
child = new AnnotationConfigApplicationContext();
child.register(ChildConfiguration.class);
child.setParent(parent);
child.refresh();

assertThat(child.containsBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)).isFalse();

parent.close();
child.close();
Comment thread
artembilan marked this conversation as resolved.
}

@Test
public void testParentChildAnnotationConfiguration() {
AnnotationConfigApplicationContext child = new AnnotationConfigApplicationContext();
Expand Down