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

Removed PostProcessorConfiguration from BindingServiceConfiguration

Browse Source 
- substituted BPPs for InitializingBeans removing the possibility of early initialization.

Resolves #1172

backport polishing
This commit is contained in:
Oleg Zhurakousky
2018-01-04 13:25:24 -05:00
parent e78528c261
commit cc22543778
1 changed files with 34 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,22 +16,18 @@
package org.springframework.cloud.stream.config;
import java.beans.Introspector;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.SmartInitializingSingleton;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -72,7 +68,6 @@ import org.springframework.messaging.core.DestinationResolver;
import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory;
import org.springframework.messaging.handler.annotation.support.MessageHandlerMethodFactory;
import org.springframework.tuple.spel.TuplePropertyAccessor;
import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils;
/**
@@ -83,7 +78,11 @@ import org.springframework.util.CollectionUtils;
* @author Marius Bogoevici
* @author Ilayaperumal Gopinathan
* @author Gary Russell
* @author Vinicius Carvalho
* @author Artem Bilan
* @author Oleg Zhurakousky
*/
@SuppressWarnings("deprecation")
@Configuration
@EnableConfigurationProperties({ BindingServiceProperties.class, SpringIntegrationProperties.class })
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
@@ -225,91 +224,37 @@ public class BindingServiceConfiguration {
@Autowired(required=false)DestinationResolver<MessageChannel> channelResolver) {
return new BinderAwareRouterBeanPostProcessor(routers, channelResolver);
}
// IMPORTANT: Nested class to avoid instantiating all of the above early
@Configuration
protected static class PostProcessorConfiguration {
/**
* Adds property accessors for use in SpEL expression evaluation
*/
@Bean
public static BeanPostProcessor propertyAccessorBeanPostProcessor() {
final Map<String, PropertyAccessor> accessors = new HashMap<>();
accessors.put("tuplePropertyAccessor", new TuplePropertyAccessor());
accessors.put("jsonPropertyAccessor", new JsonPropertyAccessor());
return new BeanPostProcessor() {
@Override
public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
if (IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME.equals(beanName)) {
IntegrationEvaluationContextFactoryBean factoryBean = (IntegrationEvaluationContextFactoryBean) bean;
Map<String, PropertyAccessor> factoryBeanAccessors = factoryBean.getPropertyAccessors();
for (Map.Entry<String, PropertyAccessor> entry : accessors.entrySet()) {
if (!factoryBeanAccessors.containsKey(entry.getKey())) {
factoryBeanAccessors.put(entry.getKey(), entry.getValue());
}
}
factoryBean.setPropertyAccessors(factoryBeanAccessors);
@Bean
public InitializingBean propertyAccessorInjector(final IntegrationEvaluationContextFactoryBean[] iecfbs) {
return new InitializingBean() {
@Override
public void afterPropertiesSet() throws Exception {
TuplePropertyAccessor tpa = new TuplePropertyAccessor();
JsonPropertyAccessor jpa = new JsonPropertyAccessor();
if (iecfbs != null) {
for (IntegrationEvaluationContextFactoryBean iecfb : iecfbs) {
Map<String, PropertyAccessor> factoryBeanAccessors = iecfb.getPropertyAccessors();
factoryBeanAccessors.put(Introspector.decapitalize(tpa.getClass().getSimpleName()), tpa);
factoryBeanAccessors.put(Introspector.decapitalize(jpa.getClass().getSimpleName()), jpa);
}
return bean;
}
@Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
return bean;
}
};
}
@Bean
public static BeanPostProcessor messageHandlerHeaderPropagationBeanPostProcessor() {
return new NotPropagatedHeadersBeanPostProcessor();
}
private static final class NotPropagatedHeadersBeanPostProcessor
implements BeanPostProcessor, BeanFactoryAware, SmartInitializingSingleton {
private final List<AbstractReplyProducingMessageHandler> producingMessageHandlers = new ArrayList<>();
private BeanFactory beanFactory;
@Override
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
this.beanFactory = beanFactory;
}
@Override
public void afterSingletonsInstantiated() {
SpringIntegrationProperties springIntegrationProperties =
this.beanFactory.getBean(SpringIntegrationProperties.class);
for (AbstractReplyProducingMessageHandler producingMessageHandler : producingMessageHandlers) {
producingMessageHandler.addNotPropagatedHeaders(
springIntegrationProperties.getMessageHandlerNotPropagatedHeaders());
}
this.producingMessageHandlers.clear();
}
@Override
public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
// TODO: Filter out beans created by SCSt (not currently necessary)
Class<?> beanClass = ClassUtils.getUserClass(bean);
if (AbstractReplyProducingMessageHandler.class.isAssignableFrom(beanClass)) {
this.producingMessageHandlers.add((AbstractReplyProducingMessageHandler) bean);
}
return bean;
}
@Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
return bean;
}
}
};
}
@Bean
public static InitializingBean messageHandlerHeaderPropagationBeanPostProcessor(@Autowired(required=false) final List<AbstractReplyProducingMessageHandler> producingMessageHandlers,
final @Autowired SpringIntegrationProperties springIntegrationProperties) {
return new InitializingBean() {
@Override
public void afterPropertiesSet() throws Exception {
if (!CollectionUtils.isEmpty(producingMessageHandlers)) {
String[] messageHandlerNotPropagatedHeaders = springIntegrationProperties.getMessageHandlerNotPropagatedHeaders();
for (AbstractReplyProducingMessageHandler producingMessageHandler : producingMessageHandlers) {
producingMessageHandler.addNotPropagatedHeaders(messageHandlerNotPropagatedHeaders);
}
}
}
};
}
}