From 35b77dabafbeecf69395462e721fd2c449db1f8f Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 30 Jul 2008 16:45:00 +0000 Subject: [PATCH] Removed setName from the MessageEndpoint interface, and the annotation post-processors now return AbstractEndpoint instead of MessageEndpoint. --- .../config/annotation/AnnotationMethodPostProcessor.java | 4 ++-- .../config/annotation/HandlerAnnotationPostProcessor.java | 4 ++-- .../config/annotation/MessagingAnnotationPostProcessor.java | 3 ++- .../config/annotation/SourceAnnotationPostProcessor.java | 4 ++-- .../config/annotation/TargetAnnotationPostProcessor.java | 4 ++-- .../springframework/integration/endpoint/MessageEndpoint.java | 2 -- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AnnotationMethodPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AnnotationMethodPostProcessor.java index ef842de69b..c28e086ddf 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AnnotationMethodPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AnnotationMethodPostProcessor.java @@ -16,7 +16,7 @@ package org.springframework.integration.config.annotation; -import org.springframework.integration.endpoint.MessageEndpoint; +import org.springframework.integration.endpoint.AbstractEndpoint; /** * Strategy interface for post-processing annotated methods. @@ -27,7 +27,7 @@ public interface AnnotationMethodPostProcessor { Object postProcess(Object bean, String beanName, Class originalBeanClass); - MessageEndpoint createEndpoint(Object bean, String beanName, Class originalBeanClass, + AbstractEndpoint createEndpoint(Object bean, String beanName, Class originalBeanClass, org.springframework.integration.annotation.MessageEndpoint endpointAnnotation); } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/HandlerAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/HandlerAnnotationPostProcessor.java index 6b7741e89f..2ea4e73ba8 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/HandlerAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/HandlerAnnotationPostProcessor.java @@ -37,9 +37,9 @@ import org.springframework.integration.annotation.Splitter; import org.springframework.integration.annotation.Transformer; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.ChannelRegistryAware; +import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.ConcurrencyPolicy; import org.springframework.integration.endpoint.HandlerEndpoint; -import org.springframework.integration.endpoint.MessageEndpoint; import org.springframework.integration.endpoint.interceptor.ConcurrencyInterceptor; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.MessageHandlerChain; @@ -129,7 +129,7 @@ public class HandlerAnnotationPostProcessor extends AbstractAnnotationMethodPost return handlerChain; } - public MessageEndpoint createEndpoint(Object bean, String beanName, Class originalBeanClass, + public AbstractEndpoint createEndpoint(Object bean, String beanName, Class originalBeanClass, org.springframework.integration.annotation.MessageEndpoint endpointAnnotation) { HandlerEndpoint endpoint = new HandlerEndpoint((MessageHandler) bean); String outputChannelName = endpointAnnotation.output(); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java index 6aa3d754d4..ffceb3d099 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java @@ -29,6 +29,7 @@ import org.springframework.integration.ConfigurationException; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.ChannelRegistryAware; +import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.MessageTarget; @@ -81,7 +82,7 @@ public class MessagingAnnotationPostProcessor implements BeanPostProcessor, Init AnnotationMethodPostProcessor postProcessor = entry.getValue(); bean = postProcessor.postProcess(bean, beanName, beanClass); if (endpointAnnotation != null && entry.getKey().isAssignableFrom(bean.getClass())) { - org.springframework.integration.endpoint.MessageEndpoint endpoint = + AbstractEndpoint endpoint = postProcessor.createEndpoint(bean, beanName, beanClass, endpointAnnotation); if (endpoint != null) { endpoint.setName(beanName + "." + entry.getKey().getSimpleName() + ".endpoint"); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java index fb57a4a9ed..a9f5e695a9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java @@ -26,7 +26,7 @@ import org.springframework.integration.annotation.Polled; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.dispatcher.DirectChannel; -import org.springframework.integration.endpoint.MessageEndpoint; +import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.SourceEndpoint; import org.springframework.integration.message.MethodInvokingSource; import org.springframework.integration.message.MessageSource; @@ -59,7 +59,7 @@ public class SourceAnnotationPostProcessor extends AbstractAnnotationMethodPostP return (results.size() == 1) ? results.get(0) : null; } - public MessageEndpoint createEndpoint(Object bean, String beanName, Class originalBeanClass, + public AbstractEndpoint createEndpoint(Object bean, String beanName, Class originalBeanClass, org.springframework.integration.annotation.MessageEndpoint endpointAnnotation) { SourceEndpoint endpoint = new SourceEndpoint((MessageSource) bean); Polled polledAnnotation = AnnotationUtils.findAnnotation(originalBeanClass, Polled.class); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TargetAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TargetAnnotationPostProcessor.java index 673fdffde9..9efa52c312 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TargetAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TargetAnnotationPostProcessor.java @@ -24,8 +24,8 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.integration.ConfigurationException; import org.springframework.integration.annotation.Concurrency; import org.springframework.integration.bus.MessageBus; +import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.ConcurrencyPolicy; -import org.springframework.integration.endpoint.MessageEndpoint; import org.springframework.integration.endpoint.TargetEndpoint; import org.springframework.integration.endpoint.interceptor.ConcurrencyInterceptor; import org.springframework.integration.handler.MethodInvokingTarget; @@ -59,7 +59,7 @@ public class TargetAnnotationPostProcessor extends AbstractAnnotationMethodPostP return (results.size() == 1) ? results.get(0) : null; } - public MessageEndpoint createEndpoint(Object bean, String beanName, Class originalBeanClass, + public AbstractEndpoint createEndpoint(Object bean, String beanName, Class originalBeanClass, org.springframework.integration.annotation.MessageEndpoint endpointAnnotation) { TargetEndpoint endpoint = new TargetEndpoint((MessageTarget) bean); String inputChannelName = endpointAnnotation.input(); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java index cb3d82fc2b..0c3911d6f6 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java @@ -27,8 +27,6 @@ import org.springframework.integration.scheduling.Schedule; */ public interface MessageEndpoint extends MessageTarget { - void setName(String name); - String getName(); Schedule getSchedule();