From b4e627a26a1e6bc6f703b45b1a593a380a600bae Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 28 Jul 2010 00:59:11 +0000 Subject: [PATCH] INT-1216 removed tangle between 'channel' and 'context' packages by moving the ChannelResolver interface to 'core' and the BeanFactoryChannelResolver implementation to 'context' --- .../integration/aggregator/CorrelatingMessageHandler.java | 3 ++- .../integration/aop/MessagePublishingInterceptor.java | 2 +- .../integration/aop/PublisherAnnotationAdvisor.java | 4 ++-- .../integration/channel/ExecutorChannel.java | 1 + .../integration/channel/MapBasedChannelResolver.java | 1 + .../channel/MessagePublishingErrorHandler.java | 2 ++ .../integration/channel/PublishSubscribeChannel.java | 1 + .../integration/config/RouterFactoryBean.java | 2 +- .../annotation/AbstractMethodAnnotationPostProcessor.java | 6 +++--- .../integration/config/xml/DefaultRouterParser.java | 2 +- .../{channel => context}/BeanFactoryChannelResolver.java | 4 +++- .../integration/context/IntegrationObjectSupport.java | 3 +-- .../{channel => core}/ChannelResolutionException.java | 4 +--- .../integration/{channel => core}/ChannelResolver.java | 7 ++----- .../integration/endpoint/AbstractPollingEndpoint.java | 2 +- .../integration/handler/AbstractMessageHandler.java | 4 ++-- .../handler/AbstractReplyProducingMessageHandler.java | 2 +- .../springframework/integration/handler/DelayHandler.java | 6 +++--- .../router/AbstractChannelNameResolvingMessageRouter.java | 4 ++-- .../integration/router/MethodInvokingRouter.java | 2 +- .../channel/BeanFactoryChannelResolverTests.java | 4 +++- .../integration/channel/TestChannelResolver.java | 3 ++- .../integration/config/ChannelAdapterParserTests.java | 6 +++--- .../integration/config/MessageBusParserTests.java | 4 ++-- .../config/annotation/AggregatorAnnotationTests.java | 4 ++-- .../annotation/MessagingAnnotationPostProcessorTests.java | 4 ++-- .../integration/endpoint/ReturnAddressTests.java | 4 ++-- .../history/MessageHistoryIntegrationTests.java | 6 ++++-- .../integration/router/MethodInvokingRouterTests.java | 4 ++-- .../integration/router/config/RouterParserTests.java | 2 +- .../springframework/integration/test/util/TestUtils.java | 2 +- .../file/config/FileWritingMessageHandlerFactoryBean.java | 2 +- .../integration/ip/udp/UdpMulticastEndToEndTests.java | 4 ++-- .../integration/ip/udp/UdpUnicastEndToEndTests.java | 4 ++-- .../mail/config/MailToStringTransformerParserTests.java | 4 ++-- .../integration/samples/ws/WebServiceDemo.java | 4 ++-- .../springframework/integration/test/util/TestUtils.java | 2 +- .../integration/xml/config/StubChannelResolver.java | 8 +++----- 38 files changed, 69 insertions(+), 64 deletions(-) rename spring-integration-core/src/main/java/org/springframework/integration/{channel => context}/BeanFactoryChannelResolver.java (93%) rename spring-integration-core/src/main/java/org/springframework/integration/{channel => core}/ChannelResolutionException.java (91%) rename spring-integration-core/src/main/java/org/springframework/integration/{channel => core}/ChannelResolver.java (83%) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java index f2c524d993..b975adca1c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java @@ -18,9 +18,10 @@ import java.util.concurrent.ConcurrentMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.channel.ChannelResolver; + import org.springframework.integration.channel.MessagingTemplate; import org.springframework.integration.channel.NullChannel; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHeaders; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java index 2c8726b626..93838d062d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java @@ -32,8 +32,8 @@ import org.springframework.expression.ParseException; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.MessagingTemplate; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java index 0066fb677e..d6d7279684 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import org.springframework.aop.support.ComposablePointcut; import org.springframework.aop.support.annotation.AnnotationMatchingPointcut; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.integration.channel.BeanFactoryChannelResolver; +import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.core.MessageChannel; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java index f50037865f..737b2fe0ea 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java @@ -18,6 +18,7 @@ package org.springframework.integration.channel; import java.util.concurrent.Executor; +import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.dispatcher.LoadBalancingStrategy; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/MapBasedChannelResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/MapBasedChannelResolver.java index d65484e7ae..bf9ddee08b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/MapBasedChannelResolver.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/MapBasedChannelResolver.java @@ -19,6 +19,7 @@ package org.springframework.integration.channel; import java.util.HashMap; import java.util.Map; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java index 44fe5ef658..bcc7275577 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java @@ -20,7 +20,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; +import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.context.IntegrationContextUtils; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java index 754d0e412f..cc44662174 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java @@ -18,6 +18,7 @@ package org.springframework.integration.channel; import java.util.concurrent.Executor; +import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.dispatcher.BroadcastingDispatcher; import org.springframework.integration.util.ErrorHandlingTaskExecutor; import org.springframework.util.ErrorHandler; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java index ae49a9ddd5..833792a94b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java @@ -16,7 +16,7 @@ package org.springframework.integration.config; -import org.springframework.integration.channel.ChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageHandler; import org.springframework.integration.router.AbstractChannelNameResolvingMessageRouter; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java index 2bbc57b0c2..685ff5b6d0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,9 +25,9 @@ import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.Order; -import org.springframework.integration.channel.BeanFactoryChannelResolver; -import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.SubscribableChannel; +import org.springframework.integration.context.BeanFactoryChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.EventDrivenConsumer; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultRouterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultRouterParser.java index cfd7c32749..b5fa36a531 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultRouterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultRouterParser.java @@ -74,7 +74,7 @@ public class DefaultRouterParser extends AbstractDelegatingConsumerEndpointParse } else { RootBeanDefinition resolverBeanDefintion = new RootBeanDefinition( - IntegrationNamespaceUtils.BASE_PACKAGE + ".channel.BeanFactoryChannelResolver"); + IntegrationNamespaceUtils.BASE_PACKAGE + ".context.BeanFactoryChannelResolver"); builder.addPropertyValue(CHANNEL_RESOLVER_PROPERTY, resolverBeanDefintion); } IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "default-output-channel"); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/BeanFactoryChannelResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/context/BeanFactoryChannelResolver.java similarity index 93% rename from spring-integration-core/src/main/java/org/springframework/integration/channel/BeanFactoryChannelResolver.java rename to spring-integration-core/src/main/java/org/springframework/integration/context/BeanFactoryChannelResolver.java index 5e7e55c9a2..b61f9fa83e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/BeanFactoryChannelResolver.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/context/BeanFactoryChannelResolver.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.springframework.integration.channel; +package org.springframework.integration.context; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; +import org.springframework.integration.core.ChannelResolutionException; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java index b3c8082c19..300bfd1e0c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java @@ -26,8 +26,7 @@ import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.core.convert.ConversionService; -import org.springframework.integration.channel.BeanFactoryChannelResolver; -import org.springframework.integration.channel.ChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.history.MessageHistoryWriter; import org.springframework.integration.history.NamedComponent; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelResolutionException.java b/spring-integration-core/src/main/java/org/springframework/integration/core/ChannelResolutionException.java similarity index 91% rename from spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelResolutionException.java rename to spring-integration-core/src/main/java/org/springframework/integration/core/ChannelResolutionException.java index 28026f3dd8..cc09528e29 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelResolutionException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/ChannelResolutionException.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.channel; - -import org.springframework.integration.core.MessagingException; +package org.springframework.integration.core; /** * Thrown by a ChannelResolver when it cannot resolve a channel name. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/core/ChannelResolver.java similarity index 83% rename from spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelResolver.java rename to spring-integration-core/src/main/java/org/springframework/integration/core/ChannelResolver.java index e91841636b..05ddf01691 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelResolver.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/ChannelResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.channel; - -import org.springframework.integration.core.MessageChannel; - +package org.springframework.integration.core; /** * Strategy for resolving a name to a {@link MessageChannel}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java index a08d32a300..ba1bd734a7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java @@ -25,8 +25,8 @@ import org.aopalliance.aop.Advice; import org.springframework.aop.framework.ProxyFactory; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.MessagePublishingErrorHandler; +import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.util.ErrorHandlingTaskExecutor; import org.springframework.scheduling.Trigger; import org.springframework.transaction.PlatformTransactionManager; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java index 7aa84754da..b0fe23f751 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java @@ -19,9 +19,9 @@ package org.springframework.integration.handler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.Ordered; -import org.springframework.integration.channel.ChannelResolutionException; -import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.context.IntegrationObjectSupport; +import org.springframework.integration.core.ChannelResolutionException; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java index 7126d84293..3d5a6f52d4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java @@ -16,8 +16,8 @@ package org.springframework.integration.handler; -import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.MessagingTemplate; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHeaders; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java index a262fc0d65..88e36f6460 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java @@ -24,12 +24,12 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.Ordered; -import org.springframework.integration.channel.BeanFactoryChannelResolver; -import org.springframework.integration.channel.ChannelResolutionException; -import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.MessagingTemplate; +import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.context.IntegrationObjectSupport; +import org.springframework.integration.core.ChannelResolutionException; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHeaders; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java index d69e153e33..b1998420e5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java @@ -23,8 +23,8 @@ import java.util.List; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.ConversionServiceFactory; -import org.springframework.integration.channel.ChannelResolutionException; -import org.springframework.integration.channel.ChannelResolver; +import org.springframework.integration.core.ChannelResolutionException; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java index b6606a17f3..8959c75670 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java @@ -19,7 +19,7 @@ package org.springframework.integration.router; import java.lang.reflect.Method; import org.springframework.integration.annotation.Router; -import org.springframework.integration.channel.ChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.handler.MethodInvokingMessageProcessor; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/BeanFactoryChannelResolverTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/BeanFactoryChannelResolverTests.java index cebd57b1a9..bbf6c95fba 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/BeanFactoryChannelResolverTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/BeanFactoryChannelResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ import static org.junit.Assert.assertSame; import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.integration.context.BeanFactoryChannelResolver; +import org.springframework.integration.core.ChannelResolutionException; import org.springframework.integration.core.MessageChannel; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/TestChannelResolver.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/TestChannelResolver.java index 1cfdfdcdb9..f37a2d71e2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/TestChannelResolver.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/TestChannelResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java index 9af9f9989a..974244716f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,10 +27,10 @@ import org.junit.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.BeanFactoryChannelResolver; -import org.springframework.integration.channel.ChannelResolutionException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.context.BeanFactoryChannelResolver; +import org.springframework.integration.core.ChannelResolutionException; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java index 6c3abfed28..4107502eb5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.SpringVersion; import org.springframework.core.task.SyncTaskExecutor; -import org.springframework.integration.channel.BeanFactoryChannelResolver; +import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java index 434c636a12..27987db303 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java @@ -34,9 +34,9 @@ import org.springframework.integration.aggregator.ReleaseStrategyAdapter; import org.springframework.integration.aggregator.CorrelatingMessageHandler; import org.springframework.integration.aggregator.CorrelationStrategyAdapter; import org.springframework.integration.aggregator.SequenceSizeReleaseStrategy; -import org.springframework.integration.channel.BeanFactoryChannelResolver; -import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.NullChannel; +import org.springframework.integration.context.BeanFactoryChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.message.MessageHandler; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java index 92c2735491..24d836ac5c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java @@ -31,11 +31,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.annotation.Transformer; -import org.springframework.integration.channel.BeanFactoryChannelResolver; -import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.context.BeanFactoryChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractEndpoint; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java index 0dbe146334..8b8cb7dcf0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.ChannelResolutionException; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.ChannelResolutionException; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java index 0aab948d7b..4705365a77 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.history; import static junit.framework.Assert.assertEquals; @@ -25,6 +26,7 @@ import java.util.Map; import org.junit.Test; import org.mockito.Mockito; + import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; @@ -51,7 +53,7 @@ public class MessageHistoryIntegrationTests { for (ConsumerEndpointFactoryBean cefBean : cefBeans.values()) { DirectFieldAccessor bridgeAccessor = new DirectFieldAccessor(cefBean); String handlerClassName = bridgeAccessor.getPropertyValue("handler").getClass().getName(); - assertEquals("org.springframework.integration.config.MessageHistoryAwareMessageHandler", handlerClassName); + assertEquals("org.springframework.integration.config.MessageHistoryWritingMessageHandler", handlerClassName); } } @@ -62,7 +64,7 @@ public class MessageHistoryIntegrationTests { for (ConsumerEndpointFactoryBean cefBean : cefBeans.values()) { DirectFieldAccessor bridgeAccessor = new DirectFieldAccessor(cefBean); String handlerClassName = bridgeAccessor.getPropertyValue("handler").getClass().getName(); - assertFalse("org.springframework.integration.config.MessageHistoryAwareMessageHandler".equals(handlerClassName)); + assertFalse("org.springframework.integration.config.MessageHistoryWritingMessageHandler".equals(handlerClassName)); } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java index 5ddf1a138f..135481908f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ import java.util.List; import org.junit.Test; import org.springframework.integration.annotation.Header; -import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java index 5fd37e29e6..07298578f1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java @@ -29,9 +29,9 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.annotation.Router; -import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.MessagingTemplate; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java index 4870439aa3..af3fd6754f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java @@ -31,8 +31,8 @@ import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.MessagePublishingErrorHandler; +import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerFactoryBean.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerFactoryBean.java index 88c7ce5154..489bc477b2 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerFactoryBean.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerFactoryBean.java @@ -22,7 +22,7 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.FactoryBean; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.ResourceLoader; -import org.springframework.integration.channel.ChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.file.FileNameGenerator; import org.springframework.integration.file.FileWritingMessageHandler; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java index 26ed4a3f5f..5c88c7b7ac 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java @@ -29,9 +29,9 @@ 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.BeanFactoryChannelResolver; -import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.context.BeanFactoryChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java index a8d6ae332f..453afe561c 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java @@ -28,9 +28,9 @@ 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.BeanFactoryChannelResolver; -import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.context.BeanFactoryChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java index 6c98b168f4..d37ed49d07 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +27,8 @@ import org.junit.Test; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java b/spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java index 84923a86ce..40cee38b3d 100644 --- a/spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java +++ b/spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java @@ -17,8 +17,8 @@ package org.springframework.integration.samples.ws; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.BeanFactoryChannelResolver; -import org.springframework.integration.channel.ChannelResolver; +import org.springframework.integration.context.BeanFactoryChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java index b606479a07..b7a194e6c4 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java @@ -29,8 +29,8 @@ import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.MessagePublishingErrorHandler; +import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubChannelResolver.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubChannelResolver.java index 92e3acb756..b5377cf09d 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubChannelResolver.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubChannelResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * - */ + package org.springframework.integration.xml.config; -import org.springframework.integration.channel.ChannelResolver; +import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.MessageChannel; class StubChannelResolver implements ChannelResolver{