From 517f632ce1b74010c85ee843ebd68a0c7a19d652 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 13 Jun 2012 15:39:49 -0400 Subject: [PATCH] Revert "INT-2594 added BF support to ExpressionEvaluatingCorrelationStrategy" This reverts commit 8758aec3d1af5ec414166cef1165d1b8181a12f0. Missed a second commit --- ...pressionEvaluatingCorrelationStrategy.java | 23 ++----------- ...ionEvaluatingCorrelationStrategyTests.java | 34 +++---------------- ...ression-evaluating-correlation-with-bf.xml | 18 ---------- 3 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 spring-integration-core/src/test/java/org/springframework/integration/aggregator/expression-evaluating-correlation-with-bf.xml diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategy.java index 732dcb5322..6d312628fc 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * 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. @@ -16,10 +16,6 @@ package org.springframework.integration.aggregator; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.beans.factory.InitializingBean; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; @@ -32,13 +28,11 @@ import org.springframework.util.Assert; * {@link CorrelationStrategy} implementation that evaluates an expression. * * @author Dave Syer - * @author Oleg Zhurakousky */ -public class ExpressionEvaluatingCorrelationStrategy implements CorrelationStrategy, BeanFactoryAware, InitializingBean{ +public class ExpressionEvaluatingCorrelationStrategy implements CorrelationStrategy { private static final ExpressionParser expressionParser = new SpelExpressionParser(new SpelParserConfiguration(true, true)); - private volatile BeanFactory beanFactory; private final ExpressionEvaluatingMessageProcessor processor; @@ -54,21 +48,8 @@ public class ExpressionEvaluatingCorrelationStrategy implements CorrelationStrat } - @Override public Object getCorrelationKey(Message message) { return processor.processMessage(message); } - @Override - public void setBeanFactory(BeanFactory beanFactory) throws BeansException { - this.beanFactory = beanFactory; - } - - @Override - public void afterPropertiesSet() throws Exception { - if (this.beanFactory != null){ - this.processor.setBeanFactory(this.beanFactory); - } - } - } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java index 9c175a86c7..51f6b2bc65 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java @@ -1,11 +1,11 @@ /* - * Copyright 2002-2012 the original author or authors. - * + * 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. @@ -14,25 +14,17 @@ package org.springframework.integration.aggregator; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import org.junit.Test; - -import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.support.MessageBuilder; /** * @author Alex Peters - * @author Oleg Zhurakousky */ public class ExpressionEvaluatingCorrelationStrategyTests { @@ -59,22 +51,4 @@ public class ExpressionEvaluatingCorrelationStrategyTests { assertThat(correlationKey, is(String.class)); assertThat((String) correlationKey, is("b")); } - - @Test - public void testCorrelationStrategyWithAtBeanExpression() throws Exception { - ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("expression-evaluating-correlation-with-bf.xml", this.getClass()); - MessageChannel inputChannel = context.getBean("inputChannel", MessageChannel.class); - QueueChannel outputChannel = context.getBean("outputChannel", QueueChannel.class); - Message message = MessageBuilder.withPayload("foo").setSequenceNumber(1).setSequenceSize(1).build(); - inputChannel.send(message); - Message reply = outputChannel.receive(0); - assertNotNull(reply); - } - - public static class CustomCorrelator { - public Object correlate(Object o){ - return o; - } - } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/expression-evaluating-correlation-with-bf.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/expression-evaluating-correlation-with-bf.xml deleted file mode 100644 index 67caee8797..0000000000 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/expression-evaluating-correlation-with-bf.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - -