From b0356bdea9ef8c55761e5ebd9a0affdac28aa16c Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Wed, 10 Jan 2018 22:23:11 -0500
Subject: [PATCH] 1123 made CompositeMessageChannelConfigurer conditional

Annotated CompositeMessageChannelConfigurer wih @ConditionalOnMissingBean to allow it to be overriden

Resolves #1123
---
 .../cloud/stream/config/BindingServiceConfiguration.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java
index 8bdf2530e..4233803ba 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java
@@ -140,6 +140,7 @@ public class BindingServiceConfiguration {
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	public CompositeMessageChannelConfigurer compositeMessageChannelConfigurer(
 			MessageConverterConfigurer messageConverterConfigurer) {
 		List<MessageChannelConfigurer> configurerList = new ArrayList<>();