Renamed PollingConsumerEndpoint to PollingConsumer.

This commit is contained in:
Mark Fisher
2008-11-03 14:32:02 +00:00
parent 81b75415ff
commit 3e2d09e5d7
15 changed files with 44 additions and 41 deletions

View File

@@ -40,7 +40,7 @@ import org.springframework.integration.config.xml.MessageBusParser;
import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
import org.springframework.integration.consumer.ReplyMessageHolder;
import org.springframework.integration.core.Message;
import org.springframework.integration.endpoint.PollingConsumerEndpoint;
import org.springframework.integration.endpoint.PollingConsumer;
import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
import org.springframework.integration.message.ErrorMessage;
@@ -75,7 +75,7 @@ public class ApplicationContextMessageBusTests {
}
};
handler.setBeanFactory(context);
PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(sourceChannel, handler);
PollingConsumer endpoint = new PollingConsumer(sourceChannel, handler);
endpoint.afterPropertiesSet();
context.getBeanFactory().registerSingleton("testEndpoint", endpoint);
context.refresh();
@@ -148,9 +148,9 @@ public class ApplicationContextMessageBusTests {
context.getBeanFactory().registerSingleton("output2", outputChannel2);
handler1.setOutputChannel(outputChannel1);
handler2.setOutputChannel(outputChannel2);
PollingConsumerEndpoint endpoint1 = new PollingConsumerEndpoint(inputChannel, handler1);
PollingConsumer endpoint1 = new PollingConsumer(inputChannel, handler1);
endpoint1.afterPropertiesSet();
PollingConsumerEndpoint endpoint2 = new PollingConsumerEndpoint(inputChannel, handler2);
PollingConsumer endpoint2 = new PollingConsumer(inputChannel, handler2);
endpoint2.afterPropertiesSet();
context.getBeanFactory().registerSingleton("testEndpoint1", endpoint1);
context.getBeanFactory().registerSingleton("testEndpoint2", endpoint2);
@@ -266,7 +266,7 @@ public class ApplicationContextMessageBusTests {
latch.countDown();
}
};
PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(errorChannel, handler);
PollingConsumer endpoint = new PollingConsumer(errorChannel, handler);
endpoint.afterPropertiesSet();
context.getBeanFactory().registerSingleton("testEndpoint", endpoint);
ApplicationContextMessageBus bus = new ApplicationContextMessageBus();

View File

@@ -17,9 +17,9 @@
<bean id="targetChannel" class="org.springframework.integration.channel.QueueChannel"/>
<bean id="endpoint" class="org.springframework.integration.endpoint.PollingConsumerEndpoint">
<constructor-arg ref="serviceActivator"/>
<bean id="endpoint" class="org.springframework.integration.endpoint.PollingConsumer">
<constructor-arg ref="sourceChannel"/>
<constructor-arg ref="serviceActivator"/>
</bean>
<bean id="serviceActivator" class="org.springframework.integration.consumer.ServiceActivatingHandler">

View File

@@ -35,7 +35,7 @@ import org.springframework.integration.consumer.AbstractReplyProducingMessageHan
import org.springframework.integration.consumer.ReplyMessageHolder;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.endpoint.PollingConsumerEndpoint;
import org.springframework.integration.endpoint.PollingConsumer;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.StringMessage;
import org.springframework.integration.util.TestUtils;
@@ -58,7 +58,7 @@ public class MessageChannelTemplateTests {
replyHolder.set(message.getPayload().toString().toUpperCase());
}
};
PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(requestChannel, handler);
PollingConsumer endpoint = new PollingConsumer(requestChannel, handler);
endpoint.afterPropertiesSet();
GenericApplicationContext context = new GenericApplicationContext();
context.getBeanFactory().registerSingleton("requestChannel", requestChannel);

View File

@@ -46,7 +46,7 @@ import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.config.xml.MessageBusParser;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.endpoint.PollingConsumerEndpoint;
import org.springframework.integration.endpoint.PollingConsumer;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.MessageHandler;
import org.springframework.integration.message.StringMessage;
@@ -374,8 +374,7 @@ public class MessagingAnnotationPostProcessorTests {
postProcessor.afterPropertiesSet();
AnnotatedEndpointWithPolledAnnotation bean = new AnnotatedEndpointWithPolledAnnotation();
postProcessor.postProcessAfterInitialization(bean, "testBean");
PollingConsumerEndpoint endpoint =
(PollingConsumerEndpoint) context.getBean("testBean.prependFoo.serviceActivator");
PollingConsumer endpoint = (PollingConsumer) context.getBean("testBean.prependFoo.serviceActivator");
Trigger trigger = (Trigger) new DirectFieldAccessor(endpoint).getPropertyValue("trigger");
assertEquals(IntervalTrigger.class, trigger.getClass());
DirectFieldAccessor triggerAccessor = new DirectFieldAccessor(trigger);

View File

@@ -51,7 +51,7 @@ import org.springframework.integration.util.ErrorHandler;
@SuppressWarnings("unchecked")
public class PollingConsumerEndpointTests {
private PollingConsumerEndpoint endpoint;
private PollingConsumer endpoint;
private TestTrigger trigger = new TestTrigger();
@@ -72,7 +72,7 @@ public class PollingConsumerEndpointTests {
public void init() throws InterruptedException {
consumer.counter.set(0);
trigger.reset();
endpoint = new PollingConsumerEndpoint(channelMock, consumer);
endpoint = new PollingConsumer(channelMock, consumer);
endpoint.setTaskScheduler(taskScheduler);
taskScheduler.setErrorHandler(errorHandler);
taskScheduler.start();

View File

@@ -32,7 +32,7 @@ import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.consumer.MethodInvokingMessageHandler;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessagingException;
import org.springframework.integration.endpoint.PollingConsumerEndpoint;
import org.springframework.integration.endpoint.PollingConsumer;
import org.springframework.integration.util.TestUtils;
/**
@@ -85,7 +85,7 @@ public class MethodInvokingMessageHandlerTests {
channel.send(message);
assertNull(queue.poll());
MethodInvokingMessageHandler handler = new MethodInvokingMessageHandler(testBean, "foo");
PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(channel, handler);
PollingConsumer endpoint = new PollingConsumer(channel, handler);
context.getBeanFactory().registerSingleton("testEndpoint", endpoint);
ApplicationContextMessageBus bus = new ApplicationContextMessageBus();
bus.setTaskScheduler(TestUtils.createTaskScheduler(10));