From a46583d464f07c8481a694f772b5774a446fb2b0 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 18 Nov 2010 15:37:09 -0500 Subject: [PATCH] INT-1627 removed 'beanResolver' property from ExpressionControlBusFactoryBean --- .../ExpressionControlBusFactoryBean.java | 10 --- .../config/xml/spring-integration-2.0.xsd | 26 ++----- .../ControlBusBeanResolverTests-context.xml | 17 ----- .../xml/ControlBusBeanResolverTests.java | 73 ------------------- 4 files changed, 8 insertions(+), 118 deletions(-) delete mode 100644 spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusBeanResolverTests-context.xml delete mode 100644 spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusBeanResolverTests.java diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/ExpressionControlBusFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ExpressionControlBusFactoryBean.java index 3ef16dc8f3..c0d41b224d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/ExpressionControlBusFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/ExpressionControlBusFactoryBean.java @@ -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); diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd index 63d953fae0..4bfa987685 100644 --- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd +++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd @@ -2781,30 +2781,20 @@ The list of component name patterns you want to track (e.g., tracked-components - + + 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 + ]]> - - - - - - - - - A refeerence to a bean in this Application Context that - impements BeanResolver that can be registered with SpEL evaluation context - to resolve @myBeanName still expressions[OPTIONAL]. - - - diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusBeanResolverTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusBeanResolverTests-context.xml deleted file mode 100644 index 38dd5ca477..0000000000 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusBeanResolverTests-context.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusBeanResolverTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusBeanResolverTests.java deleted file mode 100644 index b24124f2aa..0000000000 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusBeanResolverTests.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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.jmx.export.annotation.ManagedOperation; -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 { - - @ManagedOperation - public String convert(String input) { - return "cat"; - } - } - -}