SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-2883: CCE from custom error channel bean

Browse Source 
Resolves https://github.com/spring-cloud/spring-cloud-stream/issues/2883

When an applicaiton provides a custom errorChannel bean that is not of type
`PublishSubscribeChannel`, the application fails to start with a CCE. This is
because `BindingServiceConfiguration` uses a hard cast on `PublishSubscribeChannel`
without pre-checking the channel type. Fixing this issue.
This commit is contained in:
Soby Chacko
2024-01-22 17:19:55 -05:00
parent c72c548763
commit 1cda3acb22
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/config/BindingServiceConfigurationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017-2023 the original author or authors.
* Copyright 2017-2024 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.
@@ -26,9 +26,11 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.channel.PublishSubscribeChannel;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.messaging.support.GenericMessage;
@@ -37,6 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Oleg Zhurakousky
* @author Soby Chacko
*
*/
class BindingServiceConfigurationTests {
@@ -81,6 +84,17 @@ class BindingServiceConfigurationTests {
}
}
@Test // See: https://github.com/spring-cloud/spring-cloud-stream/issues/2883
void customErrorChannelDoesNotThrowExceptions() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration
.getCompleteConfiguration(CustomErrorChannelConfiguration.class))
.web(WebApplicationType.NONE).run()) {
DirectChannel channel = context.getBean("errorChannel", DirectChannel.class);
assertThat(channel).isNotNull();
}
}
@Configuration
@Import(ImportedConfiguration.class)
public static class RootConfiguration {
@@ -105,4 +119,13 @@ class BindingServiceConfigurationTests {
}
@Configuration
public static class CustomErrorChannelConfiguration {
@Bean
public DirectChannel errorChannel() {
return new DirectChannel();
}
}
}

6
core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2022 the original author or authors.
* Copyright 2015-2024 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.
@@ -152,8 +152,8 @@ public class BindingServiceConfiguration {
return new BeanPostProcessor() {
@Override
public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
if ("errorChannel".equals(beanName)) {
((PublishSubscribeChannel) bean).setIgnoreFailures(true);
if ("errorChannel".equals(beanName) && bean instanceof PublishSubscribeChannel publishSubscribeChannel) {
publishSubscribeChannel.setIgnoreFailures(true);
}
return bean;
}