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

Use SI BeanFactoryChannelResolver

Browse Source 
Resolve channel names in the HeaderChannelRegistry.

Add back MessagingTemplate (subclass of GenericMessagingTemplate).
This commit is contained in:
Gary Russell
2013-11-25 18:05:57 -05:00
parent a24b9ffa22
commit 48a005ec2a
58 changed files with 227 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java
View File

@@ -40,7 +40,7 @@ import org.springframework.integration.util.UUIDConverter;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
@@ -82,7 +82,7 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageH
private MessageChannel outputChannel;
private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
private final MessagingTemplate messagingTemplate = new MessagingTemplate();
private volatile MessageChannel discardChannel = new NullChannel();

4
spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
View File

@@ -40,7 +40,7 @@ import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.DestinationResolver;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils;
*/
public class MessagePublishingInterceptor implements MethodInterceptor, BeanFactoryAware {
private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
private final MessagingTemplate messagingTemplate = new MessagingTemplate();
private volatile PublisherMetadataSource metadataSource;

5
spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
View File

@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.Set;
import org.aopalliance.aop.Advice;
import org.springframework.aop.ClassFilter;
import org.springframework.aop.MethodMatcher;
import org.springframework.aop.Pointcut;
@@ -35,8 +36,8 @@ import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.integration.annotation.Publisher;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.util.Assert;
/**
@@ -72,7 +73,7 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen
}
public void setBeanFactory(BeanFactory beanFactory) {
this.interceptor.setChannelResolver(new BeanFactoryMessageChannelDestinationResolver(beanFactory));
this.interceptor.setChannelResolver(new BeanFactoryChannelResolver(beanFactory));
this.interceptor.setBeanFactory(beanFactory);
}

6
spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java
View File

@@ -18,12 +18,12 @@ package org.springframework.integration.channel;
import java.util.concurrent.Executor;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.integration.dispatcher.LoadBalancingStrategy;
import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy;
import org.springframework.integration.dispatcher.UnicastingDispatcher;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.util.ErrorHandlingTaskExecutor;
import org.springframework.messaging.MessageChannel;
import org.springframework.util.Assert;
import org.springframework.util.ErrorHandler;
@@ -111,7 +111,7 @@ public class ExecutorChannel extends AbstractSubscribableChannel {
public final void onInit() {
if (!(this.executor instanceof ErrorHandlingTaskExecutor)) {
ErrorHandler errorHandler = new MessagePublishingErrorHandler(
new BeanFactoryMessageChannelDestinationResolver(this.getBeanFactory()));
new BeanFactoryChannelResolver(this.getBeanFactory()));
this.executor = new ErrorHandlingTaskExecutor(this.executor, errorHandler);
}
this.dispatcher = new UnicastingDispatcher(this.executor);

4
spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java
View File

@@ -22,10 +22,10 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.core.DestinationResolver;
import org.springframework.messaging.support.ErrorMessage;
import org.springframework.util.Assert;
@@ -70,7 +70,7 @@ public class MessagePublishingErrorHandler implements ErrorHandler, BeanFactoryA
public void setBeanFactory(BeanFactory beanFactory) {
Assert.notNull(beanFactory, "beanFactory must not be null");
if (this.channelResolver == null) {
this.channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory);
this.channelResolver = new BeanFactoryChannelResolver(beanFactory);
}
}

4
spring-integration-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java
View File

@@ -19,8 +19,8 @@ package org.springframework.integration.channel;
import java.util.concurrent.Executor;
import org.springframework.integration.dispatcher.BroadcastingDispatcher;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.util.ErrorHandlingTaskExecutor;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.util.ErrorHandler;
/**
@@ -139,7 +139,7 @@ public class PublishSubscribeChannel extends AbstractSubscribableChannel {
if (!(this.executor instanceof ErrorHandlingTaskExecutor)) {
if (this.errorHandler == null) {
this.errorHandler = new MessagePublishingErrorHandler(
new BeanFactoryMessageChannelDestinationResolver(this.getBeanFactory()));
new BeanFactoryChannelResolver(this.getBeanFactory()));
}
this.executor = new ErrorHandlingTaskExecutor(this.executor, this.errorHandler);
}

5
spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
View File

@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.List;
import org.aopalliance.aop.Advice;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.ListableBeanFactory;
@@ -33,10 +34,10 @@ import org.springframework.integration.context.Orderable;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.core.DestinationResolver;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -62,7 +63,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
public AbstractMethodAnnotationPostProcessor(ListableBeanFactory beanFactory) {
Assert.notNull(beanFactory, "BeanFactory must not be null");
this.beanFactory = beanFactory;
this.channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory);
this.channelResolver = new BeanFactoryChannelResolver(beanFactory);
}

15
spring-integration-core/src/main/java/org/springframework/integration/config/xml/PublishingInterceptorParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 the original author or authors.
* Copyright 2002-2013 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.
@@ -29,7 +29,10 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.aop.MessagePublishingInterceptor;
import org.springframework.integration.aop.MethodNameMappingPublisherMetadataSource;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;
@@ -38,15 +41,17 @@ import org.springframework.util.xml.DomUtils;
*
* @author Oleg Zhurakousky
* @author Mark Fisher
* @author Gary Russell
* @since 2.0
*/
public class PublishingInterceptorParser extends AbstractBeanDefinitionParser {
@Override
protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
BeanDefinitionBuilder rootBuilder = BeanDefinitionBuilder.genericBeanDefinition(
IntegrationNamespaceUtils.BASE_PACKAGE + ".aop.MessagePublishingInterceptor");
BeanDefinitionBuilder spelSourceBuilder = BeanDefinitionBuilder.genericBeanDefinition(
"org.springframework.integration.aop.MethodNameMappingPublisherMetadataSource");
MessagePublishingInterceptor.class);
BeanDefinitionBuilder spelSourceBuilder = BeanDefinitionBuilder
.genericBeanDefinition(MethodNameMappingPublisherMetadataSource.class);
Map<String, Map<?,?>> mappings = this.getMappings(element, element.getAttribute("default-channel"), parserContext);
spelSourceBuilder.addConstructorArgValue(mappings.get("payload"));
if (mappings.get("headers") != null) {
@@ -54,7 +59,7 @@ public class PublishingInterceptorParser extends AbstractBeanDefinitionParser {
}
BeanDefinitionBuilder chResolverBuilder = BeanDefinitionBuilder.genericBeanDefinition(
"org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver");
BeanFactoryChannelResolver.class);
if (mappings.get("channels") != null){
spelSourceBuilder.addPropertyValue("channelMap", mappings.get("channels"));

4
spring-integration-core/src/main/java/org/springframework/integration/core/AsyncMessagingTemplate.java
View File

@@ -26,7 +26,7 @@ import org.springframework.core.task.support.TaskExecutorAdapter;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.messaging.core.MessagePostProcessor;
import org.springframework.util.Assert;
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
* @author Mark Fisher
* @since 2.0
*/
public class AsyncMessagingTemplate extends GenericMessagingTemplate implements AsyncMessagingOperations {
public class AsyncMessagingTemplate extends MessagingTemplate implements AsyncMessagingOperations {
private volatile AsyncTaskExecutor executor = new SimpleAsyncTaskExecutor();

35
spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java Normal file
View File

@@ -0,0 +1,35 @@
/*
* Copyright 2013 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.core;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.core.GenericMessagingTemplate;
/**
* @author Gary Russell
* @since 3.0
*
*/
public class MessagingTemplate extends GenericMessagingTemplate {
@Override
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
super.setDestinationResolver(new BeanFactoryChannelResolver(beanFactory));
}
}

4
spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
View File

@@ -28,13 +28,13 @@ import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.core.task.SyncTaskExecutor;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.channel.MessagePublishingErrorHandler;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor;
import org.springframework.integration.transaction.IntegrationResourceHolder;
import org.springframework.integration.transaction.TransactionSynchronizationFactory;
import org.springframework.integration.util.ErrorHandlingTaskExecutor;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.support.ErrorMessage;
import org.springframework.scheduling.Trigger;
import org.springframework.scheduling.support.PeriodicTrigger;
@@ -121,7 +121,7 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
if (this.errorHandler == null) {
Assert.notNull(this.getBeanFactory(), "BeanFactory is required");
this.errorHandler = new MessagePublishingErrorHandler(
new BeanFactoryMessageChannelDestinationResolver(getBeanFactory()));
new BeanFactoryChannelResolver(getBeanFactory()));
}
this.taskExecutor = new ErrorHandlingTaskExecutor(this.taskExecutor, this.errorHandler);
}

4
spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java
View File

@@ -23,7 +23,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageDeliveryException;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.messaging.support.ErrorMessage;
import org.springframework.util.Assert;
@@ -41,7 +41,7 @@ public abstract class MessageProducerSupport extends AbstractEndpoint implements
private volatile boolean shouldTrack = false;
private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
private final MessagingTemplate messagingTemplate = new MessagingTemplate();
public void setOutputChannel(MessageChannel outputChannel) {

4
spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java
View File

@@ -24,7 +24,7 @@ import org.springframework.integration.transaction.IntegrationResourceHolder;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.util.Assert;
/**
@@ -44,7 +44,7 @@ public class SourcePollingChannelAdapter extends AbstractPollingEndpoint
private volatile boolean shouldTrack;
private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
private final MessagingTemplate messagingTemplate = new MessagingTemplate();
/**
* Specify the source to be polled for Messages.

4
spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
View File

@@ -46,10 +46,10 @@ import org.springframework.integration.annotation.Payload;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.history.TrackableComponent;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.core.DestinationResolver;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
@@ -233,7 +233,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint implements Trackab
}
BeanFactory beanFactory = this.getBeanFactory();
if (this.channelResolver == null && beanFactory != null) {
this.channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory);
this.channelResolver = new BeanFactoryChannelResolver(beanFactory);
}
Class<?> proxyInterface = this.determineServiceInterface();
Method[] methods = ReflectionUtils.getAllDeclaredMethods(proxyInterface);

6
spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
View File

@@ -31,7 +31,7 @@ import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.messaging.support.ErrorMessage;
import org.springframework.util.Assert;
@@ -62,7 +62,7 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint implement
private final SimpleMessageConverter messageConverter = new SimpleMessageConverter();
private final GenericMessagingTemplate messagingTemplate;
private final MessagingTemplate messagingTemplate;
private final HistoryWritingMessagePostProcessor historyWritingPostProcessor = new HistoryWritingMessagePostProcessor();
@@ -74,7 +74,7 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint implement
public MessagingGatewaySupport() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setMessageConverter(this.messageConverter);
template.setSendTimeout(DEFAULT_TIMEOUT);
template.setReceiveTimeout(this.replyTimeout);

10
spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java
View File

@@ -30,7 +30,7 @@ import org.springframework.messaging.MessageDeliveryException;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.core.DestinationResolutionException;
import org.springframework.messaging.core.DestinationResolver;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils;
@@ -50,7 +50,7 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa
private volatile boolean requiresReply = false;
private final GenericMessagingTemplate messagingTemplate;
private final MessagingTemplate messagingTemplate;
private volatile RequestHandler advisedRequestHandler;
@@ -61,7 +61,7 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa
public AbstractReplyProducingMessageHandler() {
this.messagingTemplate = new GenericMessagingTemplate();
this.messagingTemplate = new MessagingTemplate();
}
@@ -93,9 +93,9 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa
}
/**
* Provides access to the {@link GenericMessagingTemplate} for subclasses.
* Provides access to the {@link MessagingTemplate} for subclasses.
*/
protected GenericMessagingTemplate getMessagingTemplate() {
protected MessagingTemplate getMessagingTemplate() {
return this.messagingTemplate;
}

4
spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
View File

@@ -26,10 +26,10 @@ import org.springframework.context.Lifecycle;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.core.MessageProducer;
import org.springframework.integration.filter.MessageFilter;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.core.DestinationResolver;
import org.springframework.util.Assert;
@@ -116,7 +116,7 @@ public class MessageHandlerChain extends AbstractMessageHandler implements Messa
this.configureChain();
BeanFactory beanFactory = this.getBeanFactory();
if (this.channelResolver == null && beanFactory != null) {
this.channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory);
this.channelResolver = new BeanFactoryChannelResolver(beanFactory);
}
this.initialized = true;
}

4
spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java
View File

@@ -21,7 +21,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.messaging.support.ErrorMessage;
import org.springframework.retry.RecoveryCallback;
import org.springframework.retry.RetryContext;
@@ -40,7 +40,7 @@ public class ErrorMessageSendingRecoverer implements RecoveryCallback<Object> {
private final static Log logger = LogFactory.getLog(ErrorMessageSendingRecoverer.class);
private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
private final MessagingTemplate messagingTemplate = new MessagingTemplate();
public ErrorMessageSendingRecoverer(MessageChannel channel) {
Assert.notNull(channel, "channel cannot be null");

4
spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdvice.java
View File

@@ -26,7 +26,7 @@ import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.messaging.support.ErrorMessage;
import org.springframework.util.Assert;
@@ -51,7 +51,7 @@ public class ExpressionEvaluatingRequestHandlerAdvice extends AbstractRequestHan
private volatile MessageChannel failureChannel;
private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
private final MessagingTemplate messagingTemplate = new MessagingTemplate();
private volatile boolean trapException = false;

6
spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java
View File

@@ -25,11 +25,11 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.jmx.export.annotation.ManagedOperation;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.core.DestinationResolutionException;
import org.springframework.messaging.core.DestinationResolver;
import org.springframework.util.Assert;
@@ -75,7 +75,7 @@ public abstract class AbstractMappingMessageRouter extends AbstractMessageRouter
/**
* Specify the {@link DestinationResolver} strategy to use.
* The default is a BeanFactoryMessageChannelDestinationResolver.
* The default is a BeanFactoryChannelResolver.
* This is considered an infrastructural configuration option and
* as of 2.1 has been deprecated as a configuration-driven attribute.
*/
@@ -134,7 +134,7 @@ public abstract class AbstractMappingMessageRouter extends AbstractMessageRouter
public void onInit() {
BeanFactory beanFactory = this.getBeanFactory();
if (this.channelResolver == null && beanFactory != null) {
this.channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory);
this.channelResolver = new BeanFactoryChannelResolver(beanFactory);
}
}

8
spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java
View File

@@ -28,7 +28,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageDeliveryException;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
/**
* Base class for all Message Routers.
@@ -48,7 +48,7 @@ public abstract class AbstractMessageRouter extends AbstractMessageHandler {
private volatile boolean applySequence;
private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
private final MessagingTemplate messagingTemplate = new MessagingTemplate();
/**
@@ -96,9 +96,9 @@ public abstract class AbstractMessageRouter extends AbstractMessageHandler {
}
/**
* Provides {@link GenericMessagingTemplate} access for subclasses.
* Provides {@link MessagingTemplate} access for subclasses.
*/
protected GenericMessagingTemplate getMessagingTemplate() {
protected MessagingTemplate getMessagingTemplate() {
return this.messagingTemplate;
}

4
spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests.java
View File

@@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.messaging.Message;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -66,7 +66,7 @@ public class NestedAggregationTests {
private List<String> sendAndReceiveMessage(DirectChannel channel, int timeout, Message<?> input) {
GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
MessagingTemplate messagingTemplate = new MessagingTemplate();
messagingTemplate.setReceiveTimeout(timeout);
@SuppressWarnings("unchecked")

4
spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java
View File

@@ -29,9 +29,9 @@ import org.junit.Test;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.core.DestinationResolver;
/**
@@ -50,7 +50,7 @@ public class MessagePublishingInterceptorTests {
@Before
public void setup() {
beanFactory = new DefaultListableBeanFactory();
channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory);
channelResolver = new BeanFactoryChannelResolver(beanFactory);
beanFactory.registerSingleton("c", testChannel);
}

6
spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests.java
View File

@@ -36,7 +36,7 @@ import org.springframework.integration.handler.AbstractReplyProducingMessageHand
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.messaging.support.ErrorMessage;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.scheduling.TaskScheduler;
@@ -72,7 +72,7 @@ public class HeaderChannelRegistryTests {
@Test
public void testReplace() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination(this.input);
Message<?> reply = template.sendAndReceive(new GenericMessage<String>("foo"));
assertNotNull(reply);
@@ -99,7 +99,7 @@ public class HeaderChannelRegistryTests {
*/
@Test
public void testReplaceError() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination(this.inputPolled);
Message<?> reply = template.sendAndReceive(new GenericMessage<String>("bar"));
assertNotNull(reply);

12
spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java
View File

@@ -36,14 +36,14 @@ import org.springframework.integration.MessageDispatchingException;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageDeliveryException;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.core.DestinationResolutionException;
import org.springframework.messaging.support.GenericMessage;
/**
* @author Mark Fisher
@@ -112,7 +112,7 @@ public class ChannelAdapterParserTests {
String beanName = "outboundWithImplicitChannel";
Object channel = this.applicationContext.getBean(beanName);
assertTrue(channel instanceof DirectChannel);
BeanFactoryMessageChannelDestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(this.applicationContext);
BeanFactoryChannelResolver channelResolver = new BeanFactoryChannelResolver(this.applicationContext);
assertNotNull(channelResolver.resolveDestination(beanName));
Object adapter = this.applicationContext.getBean(beanName + ".adapter");
assertNotNull(adapter);
@@ -142,7 +142,7 @@ public class ChannelAdapterParserTests {
String beanName = "methodInvokingConsumer";
Object channel = this.applicationContext.getBean(beanName);
assertTrue(channel instanceof DirectChannel);
BeanFactoryMessageChannelDestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(this.applicationContext);
BeanFactoryChannelResolver channelResolver = new BeanFactoryChannelResolver(this.applicationContext);
assertNotNull(channelResolver.resolveDestination(beanName));
Object adapter = this.applicationContext.getBean(beanName + ".adapter");
assertNotNull(adapter);
@@ -163,7 +163,7 @@ public class ChannelAdapterParserTests {
String beanName = "expressionConsumer";
Object channel = this.applicationContext.getBean(beanName);
assertTrue(channel instanceof DirectChannel);
BeanFactoryMessageChannelDestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(this.applicationContext);
BeanFactoryChannelResolver channelResolver = new BeanFactoryChannelResolver(this.applicationContext);
assertNotNull(channelResolver.resolveDestination(beanName));
Object adapter = this.applicationContext.getBean(beanName + ".adapter");
assertNotNull(adapter);
@@ -260,7 +260,7 @@ public class ChannelAdapterParserTests {
@Test(expected = DestinationResolutionException.class)
public void methodInvokingSourceAdapterIsNotChannel() {
BeanFactoryMessageChannelDestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(this.applicationContext);
BeanFactoryChannelResolver channelResolver = new BeanFactoryChannelResolver(this.applicationContext);
channelResolver.resolveDestination("methodInvokingSource");
}

7
spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
View File

@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.junit.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.context.ApplicationContext;
import org.springframework.context.event.SimpleApplicationEventMulticaster;
@@ -28,7 +29,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.core.SpringVersion;
import org.springframework.core.task.SyncTaskExecutor;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -42,7 +43,7 @@ public class MessageBusParserTests {
public void testErrorChannelReference() {
ApplicationContext context = new ClassPathXmlApplicationContext(
"messageBusWithErrorChannel.xml", this.getClass());
BeanFactoryMessageChannelDestinationResolver resolver = new BeanFactoryMessageChannelDestinationResolver(context);
BeanFactoryChannelResolver resolver = new BeanFactoryChannelResolver(context);
assertEquals(context.getBean("errorChannel"), resolver.resolveDestination("errorChannel"));
}
@@ -50,7 +51,7 @@ public class MessageBusParserTests {
public void testDefaultErrorChannel() {
ApplicationContext context = new ClassPathXmlApplicationContext(
"messageBusWithDefaults.xml", this.getClass());
BeanFactoryMessageChannelDestinationResolver resolver = new BeanFactoryMessageChannelDestinationResolver(context);
BeanFactoryChannelResolver resolver = new BeanFactoryChannelResolver(context);
assertEquals(context.getBean("errorChannel"), resolver.resolveDestination("errorChannel"));
}

4
spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java
View File

@@ -37,10 +37,10 @@ import org.springframework.integration.aggregator.MethodInvokingReleaseStrategy;
import org.springframework.integration.aggregator.SequenceSizeReleaseStrategy;
import org.springframework.integration.channel.NullChannel;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.core.DestinationResolver;
/**
@@ -71,7 +71,7 @@ public class AggregatorAnnotationTests {
final String endpointName = "endpointWithCustomizedAnnotation";
MessageHandler aggregator = this.getAggregator(context, endpointName);
assertTrue(getPropertyValue(aggregator, "releaseStrategy") instanceof SequenceSizeReleaseStrategy);
DestinationResolver<MessageChannel> channelResolver = new BeanFactoryMessageChannelDestinationResolver(context);
DestinationResolver<MessageChannel> channelResolver = new BeanFactoryChannelResolver(context);
assertEquals(channelResolver.resolveDestination("outputChannel"), getPropertyValue(aggregator, "outputChannel"));
assertEquals(channelResolver.resolveDestination("discardChannel"), getPropertyValue(aggregator,
"discardChannel"));

7
spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java
View File

@@ -24,6 +24,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -34,15 +35,15 @@ import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.integration.test.util.TestUtils.TestApplicationContext;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.core.DestinationResolver;
import org.springframework.messaging.support.GenericMessage;
/**
* @author Mark Fisher
@@ -135,7 +136,7 @@ public class MessagingAnnotationPostProcessorTests {
OutboundOnlyTestBean testBean = new OutboundOnlyTestBean(latch);
postProcessor.postProcessAfterInitialization(testBean, "testBean");
context.refresh();
DestinationResolver<MessageChannel> channelResolver = new BeanFactoryMessageChannelDestinationResolver(context);
DestinationResolver<MessageChannel> channelResolver = new BeanFactoryChannelResolver(context);
MessageChannel testChannel = channelResolver.resolveDestination("testChannel");
testChannel.send(new GenericMessage<String>("foo"));
latch.await(1000, TimeUnit.MILLISECONDS);

4
spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests.java
View File

@@ -35,7 +35,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@@ -109,7 +109,7 @@ public class BridgeParserTests extends AbstractJUnit4SpringContextTests {
@Test
public void bridgeWithSendTimeout() {
BridgeHandler handler = (BridgeHandler) new DirectFieldAccessor(bridgeWithSendTimeout).getPropertyValue("handler");
GenericMessagingTemplate template = (GenericMessagingTemplate) new DirectFieldAccessor(handler).getPropertyValue("messagingTemplate");
MessagingTemplate template = (MessagingTemplate) new DirectFieldAccessor(handler).getPropertyValue("messagingTemplate");
assertEquals(new Long(1234), new DirectFieldAccessor(template).getPropertyValue("sendTimeout"));
}

4
spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java
View File

@@ -35,7 +35,7 @@ import org.springframework.jmx.export.annotation.ManagedOperation;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -79,7 +79,7 @@ public class ControlBusTests {
@Test
public void testControlHeaderChannelReaper() throws InterruptedException {
GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
MessagingTemplate messagingTemplate = new MessagingTemplate();
messagingTemplate.convertAndSend(input, "@integrationHeaderChannelRegistry.size()");
Message<?> result = this.output.receive(0);
assertNotNull(result);

4
spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java
View File

@@ -31,7 +31,7 @@ import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -142,7 +142,7 @@ public class HeaderEnricherOverwriteTests {
@Test
public void priorityExplicitOverwriteTrue() {
MessageChannel channel = context.getBean("priorityExplicitOverwriteTrueInput", MessageChannel.class);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination(channel);
Message<?> result = template.sendAndReceive(new GenericMessage<String>("test"));
assertNotNull(result);

30
spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java
View File

@@ -36,7 +36,7 @@ import org.springframework.integration.transformer.MessageTransformationExceptio
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -101,7 +101,7 @@ public class HeaderEnricherTests {
@Test
public void correlationIdValue() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("correlationIdValueInput", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
@@ -110,7 +110,7 @@ public class HeaderEnricherTests {
@Test
public void correlationIdValueWithType() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("correlationIdValueWithTypeInput", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
@@ -121,7 +121,7 @@ public class HeaderEnricherTests {
@Test
public void correlationIdRef() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("correlationIdRefInput", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
@@ -130,7 +130,7 @@ public class HeaderEnricherTests {
@Test
public void expirationDateValue() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("expirationDateValueInput", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
@@ -139,7 +139,7 @@ public class HeaderEnricherTests {
@Test
public void expirationDateRef() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("expirationDateRefInput", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
@@ -148,7 +148,7 @@ public class HeaderEnricherTests {
@Test
public void priority() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("priorityInput", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
@@ -157,7 +157,7 @@ public class HeaderEnricherTests {
@Test
public void expressionUsingPayload() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("payloadExpressionInput", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<TestBean>(new TestBean("foo")));
assertNotNull(result);
@@ -166,7 +166,7 @@ public class HeaderEnricherTests {
@Test
public void expressionUsingHeader() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("headerExpressionInput", MessageChannel.class);
Message<?> message = MessageBuilder.withPayload("test").setHeader("testHeader1", "foo").build();
Message<?> result = template.sendAndReceive(channel, message);
@@ -176,7 +176,7 @@ public class HeaderEnricherTests {
@Test
public void expressionWithDateType() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("expressionWithDateTypeInput", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
@@ -188,7 +188,7 @@ public class HeaderEnricherTests {
@Test
public void expressionWithLongType() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("expressionWithLongTypeInput", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
@@ -198,7 +198,7 @@ public class HeaderEnricherTests {
@Test
public void refWithMethod() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("refWithMethod", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
@@ -208,7 +208,7 @@ public class HeaderEnricherTests {
@Test
public void ref() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("ref", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
@@ -219,7 +219,7 @@ public class HeaderEnricherTests {
@Test
public void innerBean() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("innerBean", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
@@ -230,7 +230,7 @@ public class HeaderEnricherTests {
@Test
public void innerBeanWithMethod() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("innerBeanWithMethod", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);

4
spring-integration-core/src/test/java/org/springframework/integration/config/xml/ServiceActivatorParserTests.java
View File

@@ -31,7 +31,7 @@ import org.springframework.integration.handler.ServiceActivatingHandler;
import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -201,7 +201,7 @@ public class ServiceActivatorParserTests {
}
private Object sendAndReceive(MessageChannel channel, Object payload) {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination(channel);
return template.convertSendAndReceive(payload, null);

10
spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java
View File

@@ -18,13 +18,13 @@ package org.springframework.integration.router.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import java.io.ByteArrayInputStream;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,10 +34,10 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.InputStreamResource;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.messaging.Message;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -88,7 +88,7 @@ public class PayloadTypeRouterParserTests {
}
@SuppressWarnings("unused")
private String routerConfigFakeType =
private final String routerConfigFakeType =
"<?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\"" +
@@ -102,7 +102,7 @@ public class PayloadTypeRouterParserTests {
" </payload-type-router>" +
"</beans:beans>";
private String routerConfigNoMaping =
private final String routerConfigNoMaping =
"<?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\"" +
@@ -119,7 +119,7 @@ public class PayloadTypeRouterParserTests {
public void foo(Message<?> message);
}
public static class MyChannelResolver extends BeanFactoryMessageChannelDestinationResolver {
public static class MyChannelResolver extends BeanFactoryChannelResolver {
MyChannelResolver() {
super(mock(BeanFactory.class));

4
spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java
View File

@@ -47,7 +47,7 @@ import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.core.DestinationResolutionException;
import org.springframework.messaging.core.DestinationResolver;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -176,7 +176,7 @@ public class RouterParserTests {
@Test
public void timeoutValueConfigured() {
assertTrue(this.routerWithTimeout instanceof MethodInvokingRouter);
GenericMessagingTemplate template = TestUtils.getPropertyValue(this.routerWithTimeout, "messagingTemplate", GenericMessagingTemplate.class);
MessagingTemplate template = TestUtils.getPropertyValue(this.routerWithTimeout, "messagingTemplate", MessagingTemplate.class);
Long timeout = TestUtils.getPropertyValue(template, "sendTimeout", Long.class);
assertEquals(new Long(1234), timeout);
}

4
spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java
View File

@@ -39,12 +39,12 @@ import org.springframework.integration.channel.MessagePublishingErrorHandler;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.support.context.NamedComponent;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageDeliveryException;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.util.Assert;
import org.springframework.util.ErrorHandler;
@@ -86,7 +86,7 @@ public abstract class TestUtils {
public static TestApplicationContext createTestApplicationContext() {
TestApplicationContext context = new TestApplicationContext();
ErrorHandler errorHandler = new MessagePublishingErrorHandler(new BeanFactoryMessageChannelDestinationResolver(context));
ErrorHandler errorHandler = new MessagePublishingErrorHandler(new BeanFactoryChannelResolver(context));
ThreadPoolTaskScheduler scheduler = createTaskScheduler(10);
scheduler.setErrorHandler(errorHandler);
registerBean(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME, scheduler, context);

12
spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java
View File

@@ -41,7 +41,7 @@ import org.springframework.integration.test.util.TestUtils;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.util.FileCopyUtils;
@@ -123,7 +123,7 @@ public class FileOutboundGatewayParserTests {
@Test
public void gatewayWithIgnoreMode() throws Exception{
final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
final MessagingTemplate messagingTemplate = new MessagingTemplate();
messagingTemplate.setDefaultDestination(this.gatewayWithIgnoreModeChannel);
final String expectedFileContent = "Initial File Content:";
@@ -159,7 +159,7 @@ public class FileOutboundGatewayParserTests {
@Test
public void gatewayWithFailMode() throws Exception{
final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
final MessagingTemplate messagingTemplate = new MessagingTemplate();
messagingTemplate.setDefaultDestination(this.gatewayWithFailModeChannel);
String expectedFileContent = "Initial File Content:";
@@ -199,7 +199,7 @@ public class FileOutboundGatewayParserTests {
@Test
public void gatewayWithFailModeLowercase() throws Exception{
final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
final MessagingTemplate messagingTemplate = new MessagingTemplate();
messagingTemplate.setDefaultDestination(this.gatewayWithFailModeLowercaseChannel);
String expectedFileContent = "Initial File Content:";
@@ -241,7 +241,7 @@ public class FileOutboundGatewayParserTests {
@Test
public void gatewayWithAppendMode() throws Exception{
final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
final MessagingTemplate messagingTemplate = new MessagingTemplate();
messagingTemplate.setDefaultDestination(this.gatewayWithAppendModeChannel);
String expectedFileContent = "Initial File Content:String content:";
@@ -280,7 +280,7 @@ public class FileOutboundGatewayParserTests {
assertFalse(TestUtils.getPropertyValue(this.gatewayWithReplaceModeHandler, "requiresReply", Boolean.class));
final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
final MessagingTemplate messagingTemplate = new MessagingTemplate();
messagingTemplate.setDefaultDestination(this.gatewayWithReplaceModeChannel);
String expectedFileContent = "String content:";

6
spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java
View File

@@ -54,7 +54,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.test.annotation.DirtiesContext;
@@ -118,8 +118,8 @@ public class HttpInboundGatewayParserTests {
assertThat((Boolean) getPropertyValue(gateway, "convertExceptions"), is(true));
assertThat((PollableChannel) getPropertyValue(gateway, "replyChannel"), is(responses));
assertNotNull(TestUtils.getPropertyValue(gateway, "errorChannel"));
GenericMessagingTemplate messagingTemplate = TestUtils.getPropertyValue(
gateway, "messagingTemplate", GenericMessagingTemplate.class);
MessagingTemplate messagingTemplate = TestUtils.getPropertyValue(
gateway, "messagingTemplate", MessagingTemplate.class);
assertEquals(Long.valueOf(1234), TestUtils.getPropertyValue(messagingTemplate, "sendTimeout"));
assertEquals(Long.valueOf(4567), TestUtils.getPropertyValue(messagingTemplate, "receiveTimeout"));

6
spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java
View File

@@ -75,7 +75,7 @@ import org.springframework.integration.test.util.TestUtils;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -477,8 +477,8 @@ public class ParserUnitTests {
DirectFieldAccessor dfa = new DirectFieldAccessor(tcpOutboundGateway);
assertSame(cfC2, dfa.getPropertyValue("connectionFactory"));
assertEquals(234L, dfa.getPropertyValue("requestTimeout"));
GenericMessagingTemplate messagingTemplate = TestUtils.getPropertyValue(tcpOutboundGateway, "messagingTemplate",
GenericMessagingTemplate.class);
MessagingTemplate messagingTemplate = TestUtils.getPropertyValue(tcpOutboundGateway, "messagingTemplate",
MessagingTemplate.class);
assertEquals(Long.valueOf(567), TestUtils.getPropertyValue(messagingTemplate, "sendTimeout", Long.class));
assertEquals(789L, dfa.getPropertyValue("remoteTimeout"));
assertEquals("outGateway",tcpOutboundGateway.getComponentName());

13
spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java
View File

@@ -26,16 +26,17 @@ import java.util.concurrent.TimeUnit;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.core.DestinationResolver;
import org.springframework.messaging.support.GenericMessage;
/**
* Sends and receives a simple message through to the Udp channel adapters.
@@ -57,13 +58,13 @@ public class UdpMulticastEndToEndTests implements Runnable {
private CountDownLatch sentFirst = new CountDownLatch(1);
private CountDownLatch firstReceived = new CountDownLatch(1);
private final CountDownLatch firstReceived = new CountDownLatch(1);
private CountDownLatch doneProcessing = new CountDownLatch(1);
private final CountDownLatch doneProcessing = new CountDownLatch(1);
private boolean okToRun = true;
private CountDownLatch readyToReceive = new CountDownLatch(1);
private final CountDownLatch readyToReceive = new CountDownLatch(1);
private static long hangAroundFor = 0;
@@ -83,7 +84,7 @@ public class UdpMulticastEndToEndTests implements Runnable {
public void launchSender(ApplicationContext applicationContext) throws Exception {
DestinationResolver<MessageChannel> channelResolver = new BeanFactoryMessageChannelDestinationResolver(applicationContext);
DestinationResolver<MessageChannel> channelResolver = new BeanFactoryChannelResolver(applicationContext);
MessageChannel inputChannel = channelResolver.resolveDestination("mcInputChannel");
if (!readyToReceive.await(30, TimeUnit.SECONDS)) {
fail("Receiver failed to start in 30s");

7
spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java
View File

@@ -28,17 +28,18 @@ import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.history.MessageHistory;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.core.DestinationResolver;
import org.springframework.messaging.support.GenericMessage;
/**
* Sends and receives a simple message through to the Udp channel adapters.
@@ -107,7 +108,7 @@ public class UdpUnicastEndToEndTests implements Runnable {
public void launchSender(ApplicationContext applicationContext) throws Exception {
DestinationResolver<MessageChannel> channelResolver = new BeanFactoryMessageChannelDestinationResolver(applicationContext);
DestinationResolver<MessageChannel> channelResolver = new BeanFactoryChannelResolver(applicationContext);
MessageChannel inputChannel = channelResolver.resolveDestination("inputChannel");
if (!readyToReceive.await(30, TimeUnit.SECONDS)) {
fail("Receiver failed to start in 30s");

8
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java
View File

@@ -38,7 +38,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
/**
* @author Dave Syer
@@ -57,7 +57,7 @@ public class JdbcOutboundGatewayParserTests {
private ConfigurableApplicationContext context;
private GenericMessagingTemplate messagingTemplate;
private MessagingTemplate messagingTemplate;
private static volatile int adviceCalled;
@@ -161,7 +161,7 @@ public class JdbcOutboundGatewayParserTests {
accessor = new DirectFieldAccessor(source);
source = accessor.getPropertyValue("messagingTemplate");
GenericMessagingTemplate messagingTemplate = (GenericMessagingTemplate) source;
MessagingTemplate messagingTemplate = (MessagingTemplate) source;
accessor = new DirectFieldAccessor(messagingTemplate);
@@ -236,7 +236,7 @@ public class JdbcOutboundGatewayParserTests {
protected void setupMessagingTemplate() {
PollableChannel pollableChannel = this.context.getBean("output", PollableChannel.class);
this.messagingTemplate = new GenericMessagingTemplate();
this.messagingTemplate = new MessagingTemplate();
this.messagingTemplate.setDefaultDestination(pollableChannel);
this.messagingTemplate.setReceiveTimeout(500);
}

6
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java
View File

@@ -40,7 +40,7 @@ import org.springframework.jdbc.core.namedparam.AbstractSqlParameterSource;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
@@ -60,7 +60,7 @@ public class JdbcPollingChannelAdapterParserTests {
private JdbcTemplate jdbcTemplate;
private GenericMessagingTemplate messagingTemplate;
private MessagingTemplate messagingTemplate;
private ConfigurableApplicationContext appCtx;
@@ -183,7 +183,7 @@ public class JdbcPollingChannelAdapterParserTests {
protected void setupMessagingTemplate() {
PollableChannel pollableChannel = this.appCtx.getBean("target", PollableChannel.class);
this.messagingTemplate = new GenericMessagingTemplate();
this.messagingTemplate = new MessagingTemplate();
this.messagingTemplate.setDefaultDestination(pollableChannel);
this.messagingTemplate.setReceiveTimeout(500);
}

4
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java
View File

@@ -42,7 +42,7 @@ import org.springframework.jdbc.core.SqlOutParameter;
import org.springframework.jdbc.core.SqlParameter;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
/**
* @author Gunnar Hillert
@@ -82,7 +82,7 @@ public class StoredProcOutboundGatewayParserTests {
accessor = new DirectFieldAccessor(source);
source = accessor.getPropertyValue("messagingTemplate");
GenericMessagingTemplate messagingTemplate = (GenericMessagingTemplate) source;
MessagingTemplate messagingTemplate = (MessagingTemplate) source;
accessor = new DirectFieldAccessor(messagingTemplate);

18
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java
View File

@@ -33,7 +33,7 @@ import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
/**
* @author ozhurakousky
@@ -63,7 +63,7 @@ public class ExtractRequestReplyPayloadTests {
jmsInputChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof String);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -85,7 +85,7 @@ public class ExtractRequestReplyPayloadTests {
jmsInputChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof String);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -107,7 +107,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof javax.jms.Message);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -130,7 +130,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof javax.jms.Message);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -152,7 +152,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof String);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -172,7 +172,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof String);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -192,7 +192,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof String);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -218,7 +218,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof javax.jms.Message);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}

4
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests.java
View File

@@ -29,7 +29,7 @@ import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -81,7 +81,7 @@ public class JmsDynamicDestinationTests {
public void gateway() throws Exception {
Message<?> message1 = MessageBuilder.withPayload("test-1").setHeader("destinationNumber", 1).build();
Message<?> message2 = MessageBuilder.withPayload("test-2").setHeader("destinationNumber", 2).build();
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
Message<?> result1 = template.sendAndReceive(gatewayChannel, message1);
Message<?> result2 = template.sendAndReceive(gatewayChannel, message2);
assertNotNull(result1);

4
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java
View File

@@ -59,7 +59,7 @@ import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
/**
* @author Jonas Partner
@@ -219,7 +219,7 @@ public class JmsOutboundGatewayParserTests {
Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "inboundGateway", 0);
assertNotNull(componentHistoryRecord);
assertEquals("jms:inbound-gateway", componentHistoryRecord.get("type"));
GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
MessagingTemplate messagingTemplate = new MessagingTemplate();
messagingTemplate.setDefaultDestination((MessageChannel)message.getHeaders().getReplyChannel());
messagingTemplate.send(message);
}

4
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java
View File

@@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.jmx.export.MBeanExporter;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -40,7 +40,7 @@ public class ControlBusParserTests {
@Test
public void testControlMessageToChannelMetrics() throws InterruptedException {
MessageChannel control = this.context.getBean("controlChannel", MessageChannel.class);
GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
MessagingTemplate messagingTemplate = new MessagingTemplate();
Object value = messagingTemplate.convertSendAndReceive(control,
"@integrationMbeanExporter.getChannelSendRate('testChannel').count", null);
assertEquals(new Integer(0), value);

6
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java
View File

@@ -28,7 +28,7 @@ import org.springframework.integration.mail.MailHeaders;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -47,7 +47,7 @@ public class MailHeaderEnricherTests {
@Test
public void literalValues() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination(literalValuesInput);
Message<?> result = template.sendAndReceive(new GenericMessage<String>("test"));
Map<String, Object> headers = result.getHeaders();
@@ -63,7 +63,7 @@ public class MailHeaderEnricherTests {
@Test
public void expressions() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination(expressionsInput);
Message<?> result = template.sendAndReceive(new GenericMessage<String>("foo"));
Map<String, Object> headers = result.getHeaders();

14
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java
View File

@@ -24,13 +24,15 @@ import javax.mail.internet.MimeMessage;
import org.easymock.classextension.EasyMock;
import org.junit.Test;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.support.GenericMessage;
/**
* @author Mark Fisher
@@ -41,8 +43,8 @@ public class MailToStringTransformerParserTests {
public void topLevelTransformer() throws Exception {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
"mailToStringTransformerParserTests.xml", this.getClass());
MessageChannel input = new BeanFactoryMessageChannelDestinationResolver(context).resolveDestination("input");
PollableChannel output = (PollableChannel) new BeanFactoryMessageChannelDestinationResolver(context).resolveDestination("output");
MessageChannel input = new BeanFactoryChannelResolver(context).resolveDestination("input");
PollableChannel output = (PollableChannel) new BeanFactoryChannelResolver(context).resolveDestination("output");
MimeMessage mimeMessage = EasyMock.createNiceMock(MimeMessage.class);
EasyMock.expect(mimeMessage.getContent()).andReturn("hello");
EasyMock.replay(mimeMessage);
@@ -57,8 +59,8 @@ public class MailToStringTransformerParserTests {
public void transformerWithinChain() throws Exception {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
"mailToStringTransformerWithinChain.xml", this.getClass());
MessageChannel input = new BeanFactoryMessageChannelDestinationResolver(context).resolveDestination("input");
PollableChannel output = (PollableChannel) new BeanFactoryMessageChannelDestinationResolver(context).resolveDestination("output");
MessageChannel input = new BeanFactoryChannelResolver(context).resolveDestination("input");
PollableChannel output = (PollableChannel) new BeanFactoryChannelResolver(context).resolveDestination("output");
MimeMessage mimeMessage = EasyMock.createNiceMock(MimeMessage.class);
EasyMock.expect(mimeMessage.getContent()).andReturn("foo");
EasyMock.replay(mimeMessage);

4
spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java
View File

@@ -34,13 +34,13 @@ import org.springframework.integration.channel.AbstractMessageChannel;
import org.springframework.integration.channel.MessagePublishingErrorHandler;
import org.springframework.integration.dispatcher.AbstractDispatcher;
import org.springframework.integration.dispatcher.BroadcastingDispatcher;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.support.converter.SimpleMessageConverter;
import org.springframework.integration.util.ErrorHandlingTaskExecutor;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageDeliveryException;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.support.converter.MessageConverter;
import org.springframework.util.Assert;
import org.springframework.util.ErrorHandler;
@@ -127,7 +127,7 @@ public class SubscribableRedisChannel extends AbstractMessageChannel implements
this.container.setConnectionFactory(connectionFactory);
if (!(this.taskExecutor instanceof ErrorHandlingTaskExecutor)) {
ErrorHandler errorHandler = new MessagePublishingErrorHandler(
new BeanFactoryMessageChannelDestinationResolver(this.getBeanFactory()));
new BeanFactoryChannelResolver(this.getBeanFactory()));
this.taskExecutor = new ErrorHandlingTaskExecutor(this.taskExecutor, errorHandler);
}
this.container.setTaskExecutor(this.taskExecutor);

4
spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpoint.java
View File

@@ -31,6 +31,7 @@ import org.springframework.integration.channel.MessagePublishingErrorHandler;
import org.springframework.integration.endpoint.MessageProducerSupport;
import org.springframework.integration.redis.event.RedisExceptionEvent;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.util.ErrorHandlingTaskExecutor;
import org.springframework.jmx.export.annotation.ManagedMetric;
import org.springframework.jmx.export.annotation.ManagedOperation;
@@ -38,7 +39,6 @@ import org.springframework.jmx.export.annotation.ManagedResource;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.util.Assert;
/**
@@ -158,7 +158,7 @@ public class RedisQueueMessageDrivenEndpoint extends MessageProducerSupport impl
}
if (!(this.taskExecutor instanceof ErrorHandlingTaskExecutor) && this.getBeanFactory() != null) {
MessagePublishingErrorHandler errorHandler =
new MessagePublishingErrorHandler(new BeanFactoryMessageChannelDestinationResolver(this.getBeanFactory()));
new MessagePublishingErrorHandler(new BeanFactoryChannelResolver(this.getBeanFactory()));
errorHandler.setDefaultErrorChannel(this.errorChannel);
this.taskExecutor = new ErrorHandlingTaskExecutor(this.taskExecutor, errorHandler);
}

6
spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java
View File

@@ -27,7 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.rmi.RmiInboundGateway;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
/**
* @author Mark Fisher
@@ -46,7 +46,7 @@ public class RmiInboundGatewayParserTests {
DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
assertEquals(true, accessor.getPropertyValue("expectReply"));
assertEquals(channel, accessor.getPropertyValue("requestChannel"));
GenericMessagingTemplate template = (GenericMessagingTemplate)
MessagingTemplate template = (MessagingTemplate)
accessor.getPropertyValue("messagingTemplate");
DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
assertEquals(1000L, templateAccessor.getPropertyValue("sendTimeout"));
@@ -62,7 +62,7 @@ public class RmiInboundGatewayParserTests {
DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
assertEquals(false, accessor.getPropertyValue("expectReply"));
assertEquals(channel, accessor.getPropertyValue("requestChannel"));
GenericMessagingTemplate template = (GenericMessagingTemplate)
MessagingTemplate template = (MessagingTemplate)
accessor.getPropertyValue("messagingTemplate");
DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
assertEquals(123L, templateAccessor.getPropertyValue("sendTimeout"));

4
spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java
View File

@@ -39,12 +39,12 @@ import org.springframework.integration.channel.MessagePublishingErrorHandler;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.support.context.NamedComponent;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageDeliveryException;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.util.Assert;
import org.springframework.util.ErrorHandler;
@@ -85,7 +85,7 @@ public abstract class TestUtils {
public static TestApplicationContext createTestApplicationContext() {
TestApplicationContext context = new TestApplicationContext();
ErrorHandler errorHandler = new MessagePublishingErrorHandler(new BeanFactoryMessageChannelDestinationResolver(context));
ErrorHandler errorHandler = new MessagePublishingErrorHandler(new BeanFactoryChannelResolver(context));
ThreadPoolTaskScheduler scheduler = createTaskScheduler(10);
scheduler.setErrorHandler(errorHandler);
registerBean(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME, scheduler, context);

4
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingUpdatesUsingNamespace.java
View File

@@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@@ -37,7 +37,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class TestSendingUpdatesUsingNamespace extends AbstractJUnit4SpringContextTests {
private GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
private MessagingTemplate messagingTemplate = new MessagingTemplate();
@Value("#{out}") private MessageChannel channel;

6
spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests.java
View File

@@ -28,7 +28,7 @@ import org.springframework.messaging.support.GenericMessage;
import org.springframework.integration.ws.WebServiceHeaders;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -48,7 +48,7 @@ public class WebServiceHeaderEnricherTests {
@Test
public void literalValue() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination(literalValueInput);
Message<?> result = template.sendAndReceive(new GenericMessage<String>("foo"));
Map<String, Object> headers = result.getHeaders();
@@ -57,7 +57,7 @@ public class WebServiceHeaderEnricherTests {
@Test
public void expression() {
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination(expressionInput);
Message<?> result = template.sendAndReceive(new GenericMessage<String>("foo"));
Map<String, Object> headers = result.getHeaders();

9
spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java
View File

@@ -22,6 +22,8 @@ import static org.junit.Assert.assertNull;
import org.junit.After;
import org.junit.Test;
import org.w3c.dom.Document;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -30,18 +32,17 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.integration.router.AbstractMappingMessageRouter;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.integration.xml.DefaultXmlPayloadConverter;
import org.springframework.integration.xml.util.XmlTestUtil;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.test.context.ContextConfiguration;
import org.w3c.dom.Document;
/**
* @author Jonas Partner
@@ -266,6 +267,6 @@ public class XPathRouterParserTests {
}
}
public static class MyChannelResolver extends BeanFactoryMessageChannelDestinationResolver{}
public static class MyChannelResolver extends BeanFactoryChannelResolver{}
}

4
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java
View File

@@ -34,7 +34,7 @@ import org.springframework.integration.support.MessageBuilder;
import org.springframework.integration.xmpp.XmppHeaders;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -57,7 +57,7 @@ public class XmppHeaderEnricherParserTests {
@SuppressWarnings("rawtypes")
@Test
public void to() {
GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
MessagingTemplate messagingTemplate = new MessagingTemplate();
MessageHandler handler = mock(MessageHandler.class);
doAnswer(new Answer() {
public Object answer(InvocationOnMock invocation) throws Throwable {