diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java index 37b4aabbfe..9501229b56 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java @@ -35,7 +35,6 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageProducer; import org.springframework.integration.scheduling.IntervalTrigger; import org.springframework.integration.scheduling.TaskScheduler; import org.springframework.integration.scheduling.TaskSchedulerAware; @@ -65,8 +64,7 @@ import org.springframework.util.ObjectUtils; * @author Mark Fisher * @author Marius Bogoevici */ -public abstract class AbstractMessageBarrierConsumer extends AbstractMessageConsumer implements MessageProducer, - TaskSchedulerAware, InitializingBean { +public abstract class AbstractMessageBarrierConsumer extends AbstractMessageConsumer implements TaskSchedulerAware, InitializingBean { public final static long DEFAULT_SEND_TIMEOUT = 1000; @@ -102,6 +100,7 @@ public abstract class AbstractMessageBarrierConsumer extends AbstractMessageCons private ScheduledFuture reaperFutureTask; + public AbstractMessageBarrierConsumer() { this.channelTemplate.setSendTimeout(DEFAULT_SEND_TIMEOUT); } @@ -110,6 +109,7 @@ public abstract class AbstractMessageBarrierConsumer extends AbstractMessageCons this.outputChannel = outputChannel; } + /** * Specify a channel for sending Messages that arrive after their * aggregation group has either completed or timed-out. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractReplyProducingMessageConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractReplyProducingMessageConsumer.java index 995ef3b91d..4dd11bb922 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractReplyProducingMessageConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/consumer/AbstractReplyProducingMessageConsumer.java @@ -27,7 +27,6 @@ import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageProducer; import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.selector.MessageSelector; import org.springframework.util.Assert; @@ -37,8 +36,7 @@ import org.springframework.util.Assert; * * @author Mark Fisher */ -public abstract class AbstractReplyProducingMessageConsumer extends AbstractMessageConsumer - implements MessageProducer, BeanFactoryAware { +public abstract class AbstractReplyProducingMessageConsumer extends AbstractMessageConsumer implements BeanFactoryAware { public static final long DEFAULT_SEND_TIMEOUT = 1000; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageProducer.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageProducer.java deleted file mode 100644 index 9ceb1aab51..0000000000 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageProducer.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2002-2008 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.message; - -import org.springframework.integration.core.MessageChannel; - -/** - * Base interface for any component that produces Messages. - * - * @author Mark Fisher - */ -public interface MessageProducer { - - void setOutputChannel(MessageChannel outputChannel); - -}