From bd7c74b69c1bf27772c8b315834a028ec8e9ac1a Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Sun, 7 Sep 2008 21:20:00 +0000 Subject: [PATCH] Renamed SubscribableSource to Subscribable, and it no longer extends MessageSource. --- .../integration/channel/DirectChannel.java | 4 ++-- .../integration/channel/PublishSubscribeChannel.java | 4 ++-- .../integration/dispatcher/MessageDispatcher.java | 4 ++-- .../endpoint/AbstractMessageConsumingEndpoint.java | 10 +++++----- .../integration/endpoint/ChannelPoller.java | 4 ++-- .../{SubscribableSource.java => Subscribable.java} | 2 +- .../channel/config/TestSubscribableSource.java | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) rename org.springframework.integration/src/main/java/org/springframework/integration/message/{SubscribableSource.java => Subscribable.java} (94%) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/DirectChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/DirectChannel.java index 6f1c490ced..505ec2690d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/DirectChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/DirectChannel.java @@ -20,7 +20,7 @@ import org.springframework.integration.dispatcher.SimpleDispatcher; import org.springframework.integration.endpoint.MessageEndpoint; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageConsumer; -import org.springframework.integration.message.SubscribableSource; +import org.springframework.integration.message.Subscribable; /** * A channel that invokes the subscribed {@link MessageEndpoint endpoint(s)} @@ -29,7 +29,7 @@ import org.springframework.integration.message.SubscribableSource; * @author Dave Syer * @author Mark Fisher */ -public class DirectChannel extends AbstractMessageChannel implements SubscribableSource { +public class DirectChannel extends AbstractMessageChannel implements Subscribable { private final SimpleDispatcher dispatcher = new SimpleDispatcher(); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java index 3f84e7e658..95cafb14fd 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java @@ -20,12 +20,12 @@ import org.springframework.core.task.TaskExecutor; import org.springframework.integration.dispatcher.BroadcastingDispatcher; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageConsumer; -import org.springframework.integration.message.SubscribableSource; +import org.springframework.integration.message.Subscribable; /** * @author Mark Fisher */ -public class PublishSubscribeChannel extends AbstractMessageChannel implements SubscribableSource { +public class PublishSubscribeChannel extends AbstractMessageChannel implements Subscribable { private final BroadcastingDispatcher dispatcher = new BroadcastingDispatcher(); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java index cd0142b8ab..1dd6051d82 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java @@ -17,14 +17,14 @@ package org.springframework.integration.dispatcher; import org.springframework.integration.message.Message; -import org.springframework.integration.message.SubscribableSource; +import org.springframework.integration.message.Subscribable; /** * Strategy interface for dispatching messages. * * @author Mark Fisher */ -public interface MessageDispatcher extends SubscribableSource { +public interface MessageDispatcher extends Subscribable { boolean dispatch(Message message); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java index a20ac41864..61f58064a3 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java @@ -24,7 +24,7 @@ import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessagingException; -import org.springframework.integration.message.SubscribableSource; +import org.springframework.integration.message.Subscribable; import org.springframework.integration.scheduling.PollingSchedule; import org.springframework.integration.scheduling.Schedule; @@ -93,8 +93,8 @@ public abstract class AbstractMessageConsumingEndpoint extends AbstractEndpoint if (this.inputChannel == null) { throw new ConfigurationException("failed to start endpoint, inputChannel is required"); } - if (this.inputChannel instanceof SubscribableSource) { - ((SubscribableSource) inputChannel).subscribe(this); + if (this.inputChannel instanceof Subscribable) { + ((Subscribable) inputChannel).subscribe(this); } else if (this.inputChannel instanceof PollableChannel) { if (this.getTaskScheduler() == null) { @@ -111,8 +111,8 @@ public abstract class AbstractMessageConsumingEndpoint extends AbstractEndpoint if (!this.running) { return; } - if (this.inputChannel instanceof SubscribableSource) { - ((SubscribableSource) inputChannel).unsubscribe(this); + if (this.inputChannel instanceof Subscribable) { + ((Subscribable) inputChannel).unsubscribe(this); } else if (this.poller != null) { this.getTaskScheduler().cancel(poller, true); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ChannelPoller.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ChannelPoller.java index 5669fb3090..14a169a8bd 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ChannelPoller.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ChannelPoller.java @@ -20,14 +20,14 @@ import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.dispatcher.SimpleDispatcher; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageConsumer; -import org.springframework.integration.message.SubscribableSource; +import org.springframework.integration.message.Subscribable; import org.springframework.integration.scheduling.Schedule; import org.springframework.util.Assert; /** * @author Mark Fisher */ -public class ChannelPoller extends AbstractPoller implements SubscribableSource { +public class ChannelPoller extends AbstractPoller implements Subscribable { private final PollableChannel channel; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/SubscribableSource.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/Subscribable.java similarity index 94% rename from org.springframework.integration/src/main/java/org/springframework/integration/message/SubscribableSource.java rename to org.springframework.integration/src/main/java/org/springframework/integration/message/Subscribable.java index a840ae9b59..4eda0a0694 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/SubscribableSource.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/Subscribable.java @@ -21,7 +21,7 @@ package org.springframework.integration.message; * * @author Mark Fisher */ -public interface SubscribableSource extends MessageSource { +public interface Subscribable { /** * Register a {@link MessageConsumer} as a subscriber to this source. diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestSubscribableSource.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestSubscribableSource.java index 0240dc075b..253caec3bb 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestSubscribableSource.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestSubscribableSource.java @@ -21,12 +21,12 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageConsumer; -import org.springframework.integration.message.SubscribableSource; +import org.springframework.integration.message.Subscribable; /** * @author Mark Fisher */ -public class TestSubscribableSource implements SubscribableSource { +public class TestSubscribableSource implements Subscribable { private final List subscibers = new CopyOnWriteArrayList();