[CAMEL-8428] Move getEndpoint() methods to EndpointAware interface
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8a78e531 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8a78e531 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8a78e531 Branch: refs/heads/master Commit: 8a78e5317b03e51c20d3de76afc99f01c3e68ebb Parents: 2db1d8d Author: Grzegorz Grzybek <gr.grzy...@gmail.com> Authored: Tue Mar 3 10:26:43 2015 +0100 Committer: Grzegorz Grzybek <gr.grzy...@gmail.com> Committed: Tue Mar 3 14:27:19 2015 +0100 ---------------------------------------------------------------------- camel-core/src/main/java/org/apache/camel/Consumer.java | 9 +-------- .../src/main/java/org/apache/camel/EndpointAware.java | 4 +++- camel-core/src/main/java/org/apache/camel/Producer.java | 7 ------- camel-core/src/main/java/org/apache/camel/Route.java | 7 ------- .../main/java/org/apache/camel/impl/DefaultConsumer.java | 2 +- .../src/main/java/org/apache/camel/spi/RouteContext.java | 10 ++-------- 6 files changed, 7 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8a78e531/camel-core/src/main/java/org/apache/camel/Consumer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/Consumer.java b/camel-core/src/main/java/org/apache/camel/Consumer.java index ee47729..3c4719b 100644 --- a/camel-core/src/main/java/org/apache/camel/Consumer.java +++ b/camel-core/src/main/java/org/apache/camel/Consumer.java @@ -21,12 +21,5 @@ package org.apache.camel; * * @version */ -public interface Consumer extends Service { - - /** - * Gets the endpoint this {@link Consumer} consumes from. - * - * @return the endpoint - */ - Endpoint getEndpoint(); +public interface Consumer extends Service, EndpointAware { } http://git-wip-us.apache.org/repos/asf/camel/blob/8a78e531/camel-core/src/main/java/org/apache/camel/EndpointAware.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/EndpointAware.java b/camel-core/src/main/java/org/apache/camel/EndpointAware.java index 2d46fb1..4780aaf 100644 --- a/camel-core/src/main/java/org/apache/camel/EndpointAware.java +++ b/camel-core/src/main/java/org/apache/camel/EndpointAware.java @@ -22,7 +22,9 @@ package org.apache.camel; public interface EndpointAware { /** - * Gets the endpoint + * Gets the endpoint associated with an object. + * It's the endpoint for sending to for components like {@link org.apache.camel.Producer} + * or for consuming from for components like {@link org.apache.camel.Consumer} or {@link org.apache.camel.Route} * * @return the endpoint */ http://git-wip-us.apache.org/repos/asf/camel/blob/8a78e531/camel-core/src/main/java/org/apache/camel/Producer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/Producer.java b/camel-core/src/main/java/org/apache/camel/Producer.java index 9599a38..2b890bc 100644 --- a/camel-core/src/main/java/org/apache/camel/Producer.java +++ b/camel-core/src/main/java/org/apache/camel/Producer.java @@ -25,13 +25,6 @@ package org.apache.camel; public interface Producer extends Processor, Service, IsSingleton, EndpointAware { /** - * Gets the endpoint this producer sends to. - * - * @return the endpoint - */ - Endpoint getEndpoint(); - - /** * Creates a new exchange to send to this endpoint * * @return a newly created exchange http://git-wip-us.apache.org/repos/asf/camel/blob/8a78e531/camel-core/src/main/java/org/apache/camel/Route.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/Route.java b/camel-core/src/main/java/org/apache/camel/Route.java index f9a8683..e53c42c 100644 --- a/camel-core/src/main/java/org/apache/camel/Route.java +++ b/camel-core/src/main/java/org/apache/camel/Route.java @@ -45,13 +45,6 @@ public interface Route extends EndpointAware { String getId(); /** - * Gets the inbound endpoint - * - * @return the inbound endpoint - */ - Endpoint getEndpoint(); - - /** * Gets the inbound {@link Consumer} * * @return the inbound consumer http://git-wip-us.apache.org/repos/asf/camel/blob/8a78e531/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java index a0b55be..919766e 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; * * @version */ -public class DefaultConsumer extends ServiceSupport implements Consumer, RouteAware, EndpointAware { +public class DefaultConsumer extends ServiceSupport implements Consumer, RouteAware { protected final Logger log = LoggerFactory.getLogger(getClass()); private final Endpoint endpoint; private final Processor processor; http://git-wip-us.apache.org/repos/asf/camel/blob/8a78e531/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java b/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java index f9c615b..54e6ad0 100644 --- a/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java +++ b/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; +import org.apache.camel.EndpointAware; import org.apache.camel.Processor; import org.apache.camel.RuntimeConfiguration; import org.apache.camel.model.FromDefinition; @@ -32,14 +33,7 @@ import org.apache.camel.model.RouteDefinition; * * @version */ -public interface RouteContext extends RuntimeConfiguration { - - /** - * Gets the endpoint - * - * @return the endpoint - */ - Endpoint getEndpoint(); +public interface RouteContext extends RuntimeConfiguration, EndpointAware { /** * Gets the from type
