Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1601: added bean-resolver to control-bus

Browse Source
This commit is contained in:
Dave Syer
2010-11-12 09:26:27 +00:00
parent a0db55a75e
commit ba189d2c36
7 changed files with 138 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-integration-core/src/main/java/org/springframework/integration/config/xml/ControlBusParser.java
View File

@@ -14,10 +14,12 @@
package org.springframework.integration.config.xml;
import org.springframework.beans.BeanMetadataElement;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.control.ExpressionPayloadMessageProcessor;
import org.springframework.integration.control.ControlBusMessageProcessor;
import org.springframework.util.StringUtils;
import org.w3c.dom.Element;
/**
@@ -30,14 +32,22 @@ public class ControlBusParser extends AbstractConsumerEndpointParser {
protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder
.genericBeanDefinition(ExpressionControlBusFactoryBean.class);
builder.addConstructorArgValue(getMessageProcessorBeanDefinition(element, parserContext));
builder.addConstructorArgValue(new RootBeanDefinition(ControlBusMessageProcessor.class));
BeanMetadataElement beanResolver = getBeanResolver(element, parserContext);
if (beanResolver!=null) {
builder.addPropertyValue("beanResolver", beanResolver);
}
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "send-timeout");
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "order");
return builder;
}
protected BeanMetadataElement getMessageProcessorBeanDefinition(Element element, ParserContext parserContext) {
return new RootBeanDefinition(ExpressionPayloadMessageProcessor.class);
protected BeanMetadataElement getBeanResolver(Element element, ParserContext parserContext) {
String ref = element.getAttribute("bean-resolver");
if (!StringUtils.hasText(ref)) {
return null;
}
return new RuntimeBeanReference(ref);
}
}

18
spring-integration-core/src/main/java/org/springframework/integration/config/xml/ExpressionControlBusFactoryBean.java
View File

@@ -13,13 +13,14 @@
package org.springframework.integration.config.xml;
import org.springframework.expression.BeanResolver;
import org.springframework.integration.config.AbstractSimpleMessageHandlerFactoryBean;
import org.springframework.integration.control.ExpressionPayloadMessageProcessor;
import org.springframework.integration.control.ControlBusMessageProcessor;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.handler.ServiceActivatingHandler;
/**
* FactoryBean for creating {@link MessageHandler} instances to handle a message as a Groovy Script.
* FactoryBean for creating {@link MessageHandler} instances to handle a message as a SpEL expression.
*
* @author Dave Syer
*
@@ -28,17 +29,26 @@ import org.springframework.integration.handler.ServiceActivatingHandler;
public class ExpressionControlBusFactoryBean extends AbstractSimpleMessageHandlerFactoryBean {
private volatile Long sendTimeout;
private final ExpressionPayloadMessageProcessor processor;
private volatile BeanResolver beanResolver;
private final ControlBusMessageProcessor processor;
public ExpressionControlBusFactoryBean(ExpressionPayloadMessageProcessor processor) {
public ExpressionControlBusFactoryBean(ControlBusMessageProcessor processor) {
this.processor = processor;
}
public void setBeanResolver(BeanResolver beanResolver) {
this.beanResolver = beanResolver;
}
public void setSendTimeout(Long sendTimeout) {
this.sendTimeout = sendTimeout;
}
protected MessageHandler createHandler() {
if (beanResolver!=null) {
processor.setBeanResolver(beanResolver);
}
ServiceActivatingHandler handler = new ServiceActivatingHandler(processor);
if (this.sendTimeout != null) {
handler.setSendTimeout(this.sendTimeout);

2
spring-integration-core/src/main/java/org/springframework/integration/control/ExpressionPayloadMessageProcessor.java → spring-integration-core/src/main/java/org/springframework/integration/control/ControlBusMessageProcessor.java
View File

@@ -25,7 +25,7 @@ import org.springframework.integration.handler.AbstractMessageProcessor;
* @author Mark Fisher
* @since 2.0
*/
public class ExpressionPayloadMessageProcessor extends AbstractMessageProcessor<Object> {
public class ControlBusMessageProcessor extends AbstractMessageProcessor<Object> {
/**
* Evaluates the Message payload expression.

18
spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java
View File

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.context.expression.BeanFactoryResolver;
import org.springframework.context.expression.MapAccessor;
import org.springframework.core.convert.ConversionService;
import org.springframework.expression.BeanResolver;
import org.springframework.expression.EvaluationException;
import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser;
@@ -40,6 +41,8 @@ public abstract class AbstractExpressionEvaluator implements BeanFactoryAware {
private final BeanFactoryTypeConverter typeConverter = new BeanFactoryTypeConverter();
private volatile BeanResolver beanResolver;
public AbstractExpressionEvaluator() {
this.evaluationContext.setTypeConverter(this.typeConverter);
this.evaluationContext.addPropertyAccessor(new MapAccessor());
@@ -51,9 +54,16 @@ public abstract class AbstractExpressionEvaluator implements BeanFactoryAware {
public void setBeanFactory(final BeanFactory beanFactory) {
if (beanFactory != null) {
this.typeConverter.setBeanFactory(beanFactory);
this.evaluationContext.setBeanResolver(new BeanFactoryResolver(beanFactory));
if (beanResolver == null) {
this.evaluationContext.setBeanResolver(new BeanFactoryResolver(beanFactory));
}
}
}
public void setBeanResolver(BeanResolver beanResolver) {
this.beanResolver = beanResolver;
this.evaluationContext.setBeanResolver(beanResolver);
}
public void setConversionService(ConversionService conversionService) {
if (conversionService != null) {
@@ -68,11 +78,13 @@ public abstract class AbstractExpressionEvaluator implements BeanFactoryAware {
protected <T> T evaluateExpression(Expression expression, Message<?> message, Class<T> expectedType) {
try {
return evaluateExpression(expression, (Object) message, expectedType);
} catch (EvaluationException e) {
}
catch (EvaluationException e) {
Throwable cause = e.getCause();
throw new MessageHandlingException(message, "Expression evaluation failed: "
+ expression.getExpressionString(), cause == null ? e : cause);
} catch (Exception e) {
}
catch (Exception e) {
throw new MessageHandlingException(message, "Expression evaluation failed: "
+ expression.getExpressionString(), e);
}

9
spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
View File

@@ -2631,6 +2631,15 @@ The list of component name patterns you want to track (e.g., tracked-components
<xsd:all minOccurs="0" maxOccurs="1">
<xsd:element name="poller" type="innerPollerType" minOccurs="0" maxOccurs="1" />
</xsd:all>
<xsd:attribute name="bean-resolver" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.expression.BeanResolver" />
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attributeGroup ref="inputOutputChannelGroup" />
</xsd:complexType>
</xsd:element>

17
spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusBeanResolverTests-context.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns="http://www.springframework.org/schema/integration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:groovy="http://www.springframework.org/schema/integration/groovy"
xsi:schemaLocation="http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<channel id="output">
<queue/>
</channel>
<control-bus input-channel="input" output-channel="output" bean-resolver="beanResolver"/>
<beans:bean id="beanResolver" class="org.springframework.integration.config.xml.ControlBusBeanResolverTests$TestBeanResolver" />
</beans:beans>

68
spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusBeanResolverTests.java Normal file
View File

@@ -0,0 +1,68 @@
/*
* Copyright 2002-2010 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.config.xml;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.expression.AccessException;
import org.springframework.expression.BeanResolver;
import org.springframework.expression.EvaluationContext;
import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
import org.springframework.integration.core.PollableChannel;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Dave Syer
* @since 2.0
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
public class ControlBusBeanResolverTests {
@Autowired
private MessageChannel input;
@Autowired
private PollableChannel output;
@Test
public void testDefaultEvaluationContext() {
Message<?> message = MessageBuilder.withPayload("@service.convert('aardvark')+headers.foo").setHeader("foo", "bar").build();
this.input.send(message);
assertEquals("catbar", output.receive(0).getPayload());
assertNull(output.receive(0));
}
public static class TestBeanResolver implements BeanResolver {
public Object resolve(EvaluationContext context, String beanName) throws AccessException {
return new Service();
}
}
public static class Service {
public String convert(String input) {
return "cat";
}
}
}