From dddf29a39d868af30bf993e963beebbd3a3180d2 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 21 Jan 2011 11:31:04 -0500 Subject: [PATCH] INT-1758 deprecated setPollerMetadata() on AbstractPollingEndpoint --- .../endpoint/AbstractPollingEndpoint.java | 14 +++++++++++++- .../WebServiceOutboundGatewayParserTests.java | 3 +-- 2 files changed, 14 insertions(+), 3 deletions(-) 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 e174547f66..e81ff2bcb4 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 @@ -30,6 +30,7 @@ import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessagingException; import org.springframework.integration.channel.MessagePublishingErrorHandler; import org.springframework.integration.message.ErrorMessage; +import org.springframework.integration.scheduling.PollerMetadata; import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.util.ErrorHandlingTaskExecutor; import org.springframework.scheduling.Trigger; @@ -46,7 +47,7 @@ import org.springframework.util.ErrorHandler; public abstract class AbstractPollingEndpoint extends AbstractEndpoint implements BeanClassLoaderAware { private volatile Executor taskExecutor = new SyncTaskExecutor(); - + private volatile ErrorHandler errorHandler; private volatile Trigger trigger = new PeriodicTrigger(10); @@ -70,6 +71,17 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement this.setPhase(Integer.MAX_VALUE); } + /** + * @deprecated As of release 2.0.2, use individual setters + */ + public void setPollerMetadata(PollerMetadata pollerMetadata){ + Assert.notNull(pollerMetadata, "'pollerMetadata' must not be null."); + this.setAdviceChain(pollerMetadata.getAdviceChain()); + this.setMaxMessagesPerPoll(pollerMetadata.getMaxMessagesPerPoll()); + this.setTaskExecutor(pollerMetadata.getTaskExecutor()); + this.setTrigger(pollerMetadata.getTrigger()); + } + public void setTaskExecutor(Executor taskExecutor) { this.taskExecutor = (taskExecutor != null ? taskExecutor : new SyncTaskExecutor()); } diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java index 61a3461cf4..d6bbfb70fd 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java @@ -16,7 +16,7 @@ package org.springframework.integration.ws.config; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; @@ -27,7 +27,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.PollingConsumer; -import org.springframework.integration.scheduling.PollerMetadata; import org.springframework.integration.ws.MarshallingWebServiceOutboundGateway; import org.springframework.integration.ws.SimpleWebServiceOutboundGateway; import org.springframework.oxm.Marshaller;