From c11b35456cf62272f5b7d4e4880d7d70b326b6b7 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 28 Dec 2007 15:52:32 +0000 Subject: [PATCH] Moved annotations to a common package. --- .../{endpoint => }/annotation/DefaultOutput.java | 2 +- .../{handler => }/annotation/Handler.java | 3 +-- .../{endpoint => }/annotation/MessageEndpoint.java | 2 +- .../{endpoint => }/annotation/Polled.java | 2 +- .../integration/{aop => annotation}/Publisher.java | 2 +- .../integration/{handler => }/annotation/Router.java | 2 +- .../{handler => }/annotation/Splitter.java | 2 +- .../{endpoint => }/annotation/Subscriber.java | 2 +- .../integration/aop/PublisherAnnotationAdvisor.java | 1 + .../MessageEndpointAnnotationPostProcessor.java | 12 ++++++------ .../config/PublisherAnnotationPostProcessor.java | 2 +- .../config/SubscriberAnnotationPostProcessor.java | 2 +- .../router/RouterMessageHandlerAdapter.java | 2 +- .../router/SplitterMessageHandlerAdapter.java | 2 +- .../aop/PublisherAnnotationAdvisorTests.java | 1 + .../integration/aop/PublisherAnnotationTestBean.java | 2 ++ .../annotation/InboundChannelAdapterTestBean.java | 4 +++- .../annotation/OutboundChannelAdapterTestBean.java | 4 +++- .../endpoint/annotation/SimpleAnnotatedEndpoint.java | 3 ++- 19 files changed, 30 insertions(+), 22 deletions(-) rename spring-integration-core/src/main/java/org/springframework/integration/{endpoint => }/annotation/DefaultOutput.java (95%) rename spring-integration-core/src/main/java/org/springframework/integration/{handler => }/annotation/Handler.java (90%) rename spring-integration-core/src/main/java/org/springframework/integration/{endpoint => }/annotation/MessageEndpoint.java (95%) rename spring-integration-core/src/main/java/org/springframework/integration/{endpoint => }/annotation/Polled.java (95%) rename spring-integration-core/src/main/java/org/springframework/integration/{aop => annotation}/Publisher.java (95%) rename spring-integration-core/src/main/java/org/springframework/integration/{handler => }/annotation/Router.java (96%) rename spring-integration-core/src/main/java/org/springframework/integration/{handler => }/annotation/Splitter.java (95%) rename spring-integration-core/src/main/java/org/springframework/integration/{endpoint => }/annotation/Subscriber.java (94%) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/DefaultOutput.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/DefaultOutput.java similarity index 95% rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/DefaultOutput.java rename to spring-integration-core/src/main/java/org/springframework/integration/annotation/DefaultOutput.java index 0277425f2a..9f4c605373 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/DefaultOutput.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/DefaultOutput.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.endpoint.annotation; +package org.springframework.integration.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/Handler.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Handler.java similarity index 90% rename from spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/Handler.java rename to spring-integration-core/src/main/java/org/springframework/integration/annotation/Handler.java index 850ff40031..386a73339c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/Handler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Handler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.handler.annotation; +package org.springframework.integration.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -23,7 +23,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.integration.endpoint.annotation.MessageEndpoint; /** * Indicates that a method is capable of handling a message or message payload. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/MessageEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/MessageEndpoint.java similarity index 95% rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/MessageEndpoint.java rename to spring-integration-core/src/main/java/org/springframework/integration/annotation/MessageEndpoint.java index b0b199e460..0e2f5536b2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/MessageEndpoint.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/MessageEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.endpoint.annotation; +package org.springframework.integration.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Polled.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Polled.java similarity index 95% rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Polled.java rename to spring-integration-core/src/main/java/org/springframework/integration/annotation/Polled.java index fe482bbfa7..1917127091 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Polled.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Polled.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.endpoint.annotation; +package org.springframework.integration.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/Publisher.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Publisher.java similarity index 95% rename from spring-integration-core/src/main/java/org/springframework/integration/aop/Publisher.java rename to spring-integration-core/src/main/java/org/springframework/integration/annotation/Publisher.java index b5096b43c9..804f3da6e8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aop/Publisher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Publisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.aop; +package org.springframework.integration.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/Router.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java similarity index 96% rename from spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/Router.java rename to spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java index 3136d3cdcd..6805971bca 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/Router.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.handler.annotation; +package org.springframework.integration.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/Splitter.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java similarity index 95% rename from spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/Splitter.java rename to spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java index f0f4412cb9..c2cb6837d6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/Splitter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.handler.annotation; +package org.springframework.integration.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Subscriber.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Subscriber.java similarity index 94% rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Subscriber.java rename to spring-integration-core/src/main/java/org/springframework/integration/annotation/Subscriber.java index 35c5248a44..d2613e79eb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Subscriber.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Subscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.endpoint.annotation; +package org.springframework.integration.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; 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 6913a99309..13d09b862f 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 @@ -23,6 +23,7 @@ import org.aopalliance.aop.Advice; import org.springframework.aop.Pointcut; import org.springframework.aop.support.AbstractPointcutAdvisor; import org.springframework.aop.support.annotation.AnnotationMatchingPointcut; +import org.springframework.integration.annotation.Publisher; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java index e7c182dc8d..23730f74b1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java @@ -33,20 +33,20 @@ import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.OrderComparator; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.integration.MessagingConfigurationException; +import org.springframework.integration.annotation.DefaultOutput; +import org.springframework.integration.annotation.Handler; +import org.springframework.integration.annotation.MessageEndpoint; +import org.springframework.integration.annotation.Polled; +import org.springframework.integration.annotation.Router; +import org.springframework.integration.annotation.Splitter; import org.springframework.integration.bus.ConsumerPolicy; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.ChannelRegistryAware; import org.springframework.integration.endpoint.GenericMessageEndpoint; import org.springframework.integration.endpoint.InboundMethodInvokingChannelAdapter; import org.springframework.integration.endpoint.OutboundMethodInvokingChannelAdapter; -import org.springframework.integration.endpoint.annotation.DefaultOutput; -import org.springframework.integration.endpoint.annotation.MessageEndpoint; -import org.springframework.integration.endpoint.annotation.Polled; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.MessageHandlerChain; -import org.springframework.integration.handler.annotation.Handler; -import org.springframework.integration.handler.annotation.Router; -import org.springframework.integration.handler.annotation.Splitter; import org.springframework.integration.handler.config.DefaultMessageHandlerCreator; import org.springframework.integration.handler.config.MessageHandlerCreator; import org.springframework.integration.handler.config.RouterMessageHandlerCreator; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java index 22fec4d93e..c0347879e9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java @@ -25,7 +25,7 @@ import org.springframework.aop.support.AopUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.integration.aop.Publisher; +import org.springframework.integration.annotation.Publisher; import org.springframework.integration.aop.PublisherAnnotationAdvisor; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java index 84e1051fb5..a0a5aaa64e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java @@ -26,9 +26,9 @@ import org.springframework.aop.framework.Advised; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.integration.annotation.Subscriber; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.endpoint.GenericMessageEndpoint; -import org.springframework.integration.endpoint.annotation.Subscriber; import org.springframework.integration.handler.DefaultMessageHandlerAdapter; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java index 21e475bd4a..e6d786e3b6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java @@ -21,12 +21,12 @@ import java.util.Collection; import java.util.Map; import org.springframework.integration.MessagingConfigurationException; +import org.springframework.integration.annotation.Router; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.ChannelRegistryAware; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.endpoint.SimpleMethodInvoker; import org.springframework.integration.handler.AbstractMessageHandlerAdapter; -import org.springframework.integration.handler.annotation.Router; import org.springframework.integration.message.Message; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java index 177efd631b..c52f3f4a0c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java @@ -21,12 +21,12 @@ import java.util.Collection; import java.util.Map; import org.springframework.integration.MessagingConfigurationException; +import org.springframework.integration.annotation.Splitter; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.ChannelRegistryAware; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.endpoint.SimpleMethodInvoker; import org.springframework.integration.handler.AbstractMessageHandlerAdapter; -import org.springframework.integration.handler.annotation.Splitter; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java index f54ff20a5b..13b46a2862 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; +import org.springframework.integration.annotation.Publisher; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PointToPointChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java index f27d499a52..2470e05845 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java @@ -16,6 +16,8 @@ package org.springframework.integration.aop; +import org.springframework.integration.annotation.Publisher; + /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java index cca4cb8d76..6552b4a7aa 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java @@ -16,7 +16,9 @@ package org.springframework.integration.endpoint.annotation; -import org.springframework.integration.handler.annotation.Handler; +import org.springframework.integration.annotation.Handler; +import org.springframework.integration.annotation.MessageEndpoint; +import org.springframework.integration.annotation.Polled; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java index 3be387b2fc..8bcd6becd4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java @@ -16,7 +16,9 @@ package org.springframework.integration.endpoint.annotation; -import org.springframework.integration.handler.annotation.Handler; +import org.springframework.integration.annotation.DefaultOutput; +import org.springframework.integration.annotation.Handler; +import org.springframework.integration.annotation.MessageEndpoint; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java index 04a3055259..67691f85a3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java @@ -16,7 +16,8 @@ package org.springframework.integration.endpoint.annotation; -import org.springframework.integration.handler.annotation.Handler; +import org.springframework.integration.annotation.Handler; +import org.springframework.integration.annotation.MessageEndpoint; /** * @author Mark Fisher