From c9a58cfc4ac44e8e1bc0ab14202fd24d2c6fd06a Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Tue, 16 Nov 2010 11:36:02 -0500 Subject: [PATCH] INT-1627 renamed 'ExpressionPayloadMessageProcessor' to 'ExpressionCommandMessageProcessor' --- .../integration/config/ExpressionControlBusFactoryBean.java | 6 +++--- .../integration/config/xml/ControlBusParser.java | 2 +- ...rocessor.java => ExpressionCommandMessageProcessor.java} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename spring-integration-core/src/main/java/org/springframework/integration/handler/{ExpressionPayloadMessageProcessor.java => ExpressionCommandMessageProcessor.java} (90%) 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 3efcd7b3db..508b3651d9 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 @@ -15,7 +15,7 @@ package org.springframework.integration.config; import org.springframework.expression.BeanResolver; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.handler.ExpressionPayloadMessageProcessor; +import org.springframework.integration.handler.ExpressionCommandMessageProcessor; import org.springframework.integration.handler.ServiceActivatingHandler; /** @@ -30,10 +30,10 @@ public class ExpressionControlBusFactoryBean extends AbstractSimpleMessageHandle private volatile BeanResolver beanResolver; - private final ExpressionPayloadMessageProcessor processor; + private final ExpressionCommandMessageProcessor processor; - public ExpressionControlBusFactoryBean(ExpressionPayloadMessageProcessor processor) { + public ExpressionControlBusFactoryBean(ExpressionCommandMessageProcessor processor) { this.processor = processor; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ControlBusParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ControlBusParser.java index b9560f3587..c8acadb99e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ControlBusParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ControlBusParser.java @@ -31,7 +31,7 @@ public class ControlBusParser extends AbstractConsumerEndpointParser { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( "org.springframework.integration.config.ExpressionControlBusFactoryBean"); builder.addConstructorArgValue(new RootBeanDefinition( - "org.springframework.integration.handler.ExpressionPayloadMessageProcessor")); + "org.springframework.integration.handler.ExpressionCommandMessageProcessor")); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "bean-resolver"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "send-timeout"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "order"); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionPayloadMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionCommandMessageProcessor.java similarity index 90% rename from spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionPayloadMessageProcessor.java rename to spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionCommandMessageProcessor.java index 4ad7d91684..12f90b4cfb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionPayloadMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionCommandMessageProcessor.java @@ -24,10 +24,10 @@ import org.springframework.integration.Message; * @author Mark Fisher * @since 2.0 */ -public class ExpressionPayloadMessageProcessor extends AbstractMessageProcessor { +public class ExpressionCommandMessageProcessor extends AbstractMessageProcessor { /** - * Evaluates the Message payload expression. + * Evaluates the Message payload expression as a command. * @throws IllegalArgumentException if the payload is not an Exception or String */ public Object processMessage(Message message) {