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

INT-1627 removed 'beanResolver' property from ExpressionControlBusFactoryBean

Browse Source
This commit is contained in:
Mark Fisher
2010-11-18 15:37:09 -05:00
parent f549ccbdd9
commit a46583d464
4 changed files with 8 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ import java.util.List;
import org.springframework.context.Lifecycle;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.expression.BeanResolver;
import org.springframework.expression.MethodFilter;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.handler.ExpressionCommandMessageProcessor;
@@ -40,8 +39,6 @@ public class ExpressionControlBusFactoryBean extends AbstractSimpleMessageHandle
private volatile Long sendTimeout;
private volatile BeanResolver beanResolver;
private final MethodFilter methodFilter = new ControlBusMethodFilter();
@@ -49,16 +46,9 @@ public class ExpressionControlBusFactoryBean extends AbstractSimpleMessageHandle
this.sendTimeout = sendTimeout;
}
public void setBeanResolver(BeanResolver beanResolver) {
this.beanResolver = beanResolver;
}
protected MessageHandler createHandler() {
ExpressionCommandMessageProcessor processor = new ExpressionCommandMessageProcessor(this.methodFilter);
processor.setBeanFactory(this.getBeanFactory());
if (this.beanResolver != null) {
processor.setBeanResolver(this.beanResolver);
}
ServiceActivatingHandler handler = new ServiceActivatingHandler(processor);
if (this.sendTimeout != null) {
handler.setSendTimeout(this.sendTimeout);

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

@@ -2781,30 +2781,20 @@ The list of component name patterns you want to track (e.g., tracked-components
<xsd:element name="control-bus">
<xsd:annotation>
<xsd:documentation>
<xsd:documentation><![CDATA[
Control bus that accepts messages in the form of SpEL expressions. The expressions should be provided
either as Expression or String payloads (that can be parsed into valid Expressions). in incoming messages.
The expressions can refer to beans in the context using the standard @beanName convention.
</xsd:documentation>
either as Expression or String payloads (that can be parsed into valid Expressions) in incoming messages.
The expressions can refer to beans in the context using the standard @beanName convention. The methods
that will be available include:
1) any that are annotated with @ManagedAttribute or @ManagedOperation
2) Lifecycle methods
3) get/set or shutdown methods on configurable TaskExecutors or TaskSchedulers
]]></xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<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:documentation>
A refeerence to a bean in this Application Context that
impements BeanResolver that can be registered with SpEL evaluation context
to resolve <code>@myBeanName</code> still expressions[OPTIONAL].
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attributeGroup ref="inputOutputChannelGroup" />
</xsd:complexType>
</xsd:element>