From e78528c2616e91af43cfc65c1c67b454c07017e8 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 4 Jan 2018 08:34:29 -0500 Subject: [PATCH] polishing after back porting early initialization issues --- .../reactive/StreamEmitterAnnotationBeanPostProcessor.java | 5 +++++ .../cloud/stream/config/BindingServiceConfiguration.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/spring-cloud-stream-reactive/src/main/java/org/springframework/cloud/stream/reactive/StreamEmitterAnnotationBeanPostProcessor.java b/spring-cloud-stream-reactive/src/main/java/org/springframework/cloud/stream/reactive/StreamEmitterAnnotationBeanPostProcessor.java index 231eeed3b..3c174e4d3 100644 --- a/spring-cloud-stream-reactive/src/main/java/org/springframework/cloud/stream/reactive/StreamEmitterAnnotationBeanPostProcessor.java +++ b/spring-cloud-stream-reactive/src/main/java/org/springframework/cloud/stream/reactive/StreamEmitterAnnotationBeanPostProcessor.java @@ -108,6 +108,11 @@ public class StreamEmitterAnnotationBeanPostProcessor return bean; } + @Override + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { + return bean; + } + @Override public void start() { try { 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 e9ae7000a..bb9e7ce01 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 @@ -64,10 +64,10 @@ import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.handler.BridgeHandler; import org.springframework.integration.json.JsonPropertyAccessor; +import org.springframework.integration.router.AbstractMappingMessageRouter; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.converter.MessageConverter; -import org.springframework.integration.router.AbstractMappingMessageRouter; import org.springframework.messaging.core.DestinationResolver; import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory; import org.springframework.messaging.handler.annotation.support.MessageHandlerMethodFactory;