CAMEL-7186: Added missing @UriParam to some components in camel-core.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/34f1cf17 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/34f1cf17 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/34f1cf17 Branch: refs/heads/master Commit: 34f1cf17cfdd76e37651d7f5321e6322045f1ba6 Parents: 803c364 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Feb 10 11:42:39 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Feb 10 11:42:39 2014 +0100 ---------------------------------------------------------------------- .../camel/component/controlbus/ControlBusComponent.java | 8 ++++++-- .../camel/component/controlbus/ControlBusEndpoint.java | 2 ++ .../org/apache/camel/component/dataset/DataSetComponent.java | 8 ++++++-- .../org/apache/camel/component/dataset/DataSetEndpoint.java | 2 ++ .../org/apache/camel/component/direct/DirectComponent.java | 8 ++++++-- .../org/apache/camel/component/direct/DirectEndpoint.java | 2 ++ .../apache/camel/component/directvm/DirectVmComponent.java | 8 ++++++-- .../apache/camel/component/directvm/DirectVmEndpoint.java | 3 +++ .../apache/camel/component/language/LanguageComponent.java | 8 ++++++-- .../apache/camel/component/language/LanguageEndpoint.java | 3 +++ .../java/org/apache/camel/component/log/LogComponent.java | 8 ++++++-- .../java/org/apache/camel/component/log/LogEndpoint.java | 2 ++ .../java/org/apache/camel/component/test/TestComponent.java | 8 ++++++-- .../java/org/apache/camel/component/test/TestEndpoint.java | 3 +++ .../java/org/apache/camel/component/xslt/XsltComponent.java | 8 ++++++-- .../java/org/apache/camel/component/xslt/XsltEndpoint.java | 8 +++++++- 16 files changed, 72 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusComponent.java b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusComponent.java index 2264221..91df308 100644 --- a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusComponent.java @@ -20,15 +20,19 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; /** * The <a href="http://camel.apache.org/controlbus.html";>control bus</a> component. */ -public class ControlBusComponent extends DefaultComponent { +public class ControlBusComponent extends UriEndpointComponent { private ExecutorService executorService; + public ControlBusComponent() { + super(ControlBusEndpoint.class); + } + @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { ControlBusEndpoint answer = new ControlBusEndpoint(uri, this); http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java index 9ff4348..daacd7c 100644 --- a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java @@ -24,12 +24,14 @@ import org.apache.camel.Producer; import org.apache.camel.RuntimeCamelException; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.spi.Language; +import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.util.CamelLogger; /** * The control bus endpoint. */ +@UriEndpoint(scheme = "controlbus") public class ControlBusEndpoint extends DefaultEndpoint { private Language language; http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java index 92347fd..069c21a 100644 --- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java @@ -19,7 +19,7 @@ package org.apache.camel.component.dataset; import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.util.CamelContextHelper; /** @@ -27,7 +27,11 @@ import org.apache.camel.util.CamelContextHelper; * * @version */ -public class DataSetComponent extends DefaultComponent { +public class DataSetComponent extends UriEndpointComponent { + + public DataSetComponent() { + super(DataSetEndpoint.class); + } @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java index acca444..6999452 100644 --- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java @@ -26,6 +26,7 @@ import org.apache.camel.Processor; import org.apache.camel.Service; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.processor.ThroughputLogger; +import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.util.CamelLogger; import org.apache.camel.util.ExchangeHelper; @@ -39,6 +40,7 @@ import org.slf4j.LoggerFactory; * * @version */ +@UriEndpoint(scheme = "dataset", consumerClass = DataSetConsumer.class) public class DataSetEndpoint extends MockEndpoint implements Service { private final transient Logger log; private volatile DataSet dataSet; http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java index 2f89a6a..836ccc6 100644 --- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.util.ServiceHelper; /** @@ -29,7 +29,7 @@ import org.apache.camel.util.ServiceHelper; * * @version */ -public class DirectComponent extends DefaultComponent { +public class DirectComponent extends UriEndpointComponent { // must keep a map of consumers on the component to ensure endpoints can lookup old consumers // later in case the DirectEndpoint was re-created due the old was evicted from the endpoints LRUCache @@ -38,6 +38,10 @@ public class DirectComponent extends DefaultComponent { private boolean block; private long timeout = 30000L; + public DirectComponent() { + super(DirectEndpoint.class); + } + protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { DirectEndpoint endpoint = new DirectEndpoint(uri, this, consumers); endpoint.setBlock(block); http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java index 026d1dc..a242427 100644 --- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java @@ -24,6 +24,7 @@ import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.impl.DefaultEndpoint; +import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.util.ObjectHelper; @@ -33,6 +34,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ +@UriEndpoint(scheme = "direct", consumerClass = DirectConsumer.class) public class DirectEndpoint extends DefaultEndpoint { private volatile Map<String, DirectConsumer> consumers; http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java index 6ad3d28..12d2016 100644 --- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java @@ -24,13 +24,13 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; /** * Represents the component that manages {@link DirectVmEndpoint}. It holds the * list of named direct-vm endpoints. */ -public class DirectVmComponent extends DefaultComponent { +public class DirectVmComponent extends UriEndpointComponent { private static final AtomicInteger START_COUNTER = new AtomicInteger(); @@ -41,6 +41,10 @@ public class DirectVmComponent extends DefaultComponent { private boolean block; private long timeout = 30000L; + public DirectVmComponent() { + super(DirectVmEndpoint.class); + } + /** * Gets all the consumer endpoints. * http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java index 3f67bc2..9a090b5 100644 --- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java @@ -19,12 +19,15 @@ package org.apache.camel.component.directvm; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; +import org.apache.camel.component.direct.DirectConsumer; import org.apache.camel.impl.DefaultEndpoint; +import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; /** * The direct-vm endpoint. */ +@UriEndpoint(scheme = "direct-vm", consumerClass = DirectConsumer.class) public class DirectVmEndpoint extends DefaultEndpoint { @UriParam http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java index 2127256..24a9e07 100644 --- a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java @@ -20,7 +20,7 @@ import java.net.URLDecoder; import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.spi.Language; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.ResourceHelper; @@ -31,10 +31,14 @@ import org.apache.camel.util.ResourceHelper; * * @version */ -public class LanguageComponent extends DefaultComponent { +public class LanguageComponent extends UriEndpointComponent { public static final String RESOURCE = "resource:"; + public LanguageComponent() { + super(LanguageEndpoint.class); + } + protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { String name = ObjectHelper.before(remaining, ":"); String script = ObjectHelper.after(remaining, ":"); http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java index 9ecd069..157ba08 100644 --- a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java @@ -28,7 +28,9 @@ import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.ResourceEndpoint; +import org.apache.camel.component.direct.DirectConsumer; import org.apache.camel.spi.Language; +import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; @@ -39,6 +41,7 @@ import org.apache.camel.util.ResourceHelper; * * @version */ +@UriEndpoint(scheme = "language") public class LanguageEndpoint extends ResourceEndpoint { private Language language; private Expression expression; http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java b/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java index 308b7f4..250d745 100644 --- a/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java @@ -22,7 +22,7 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.LoggingLevel; import org.apache.camel.Processor; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.processor.CamelLogProcessor; import org.apache.camel.processor.DefaultExchangeFormatter; import org.apache.camel.processor.ThroughputLogger; @@ -35,9 +35,13 @@ import org.apache.camel.util.CamelLogger; * * @version */ -public class LogComponent extends DefaultComponent { +public class LogComponent extends UriEndpointComponent { private ExchangeFormatter exchangeFormatter; + + public LogComponent() { + super(LogEndpoint.class); + } protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { LoggingLevel level = getLoggingLevel(parameters); http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java index 7bcd1af..96b11bf 100644 --- a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java @@ -20,12 +20,14 @@ import org.apache.camel.Component; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.impl.ProcessorEndpoint; +import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.util.ServiceHelper; /** * Logger endpoint. */ +@UriEndpoint(scheme = "log") public class LogEndpoint extends ProcessorEndpoint { private volatile Processor logger; http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java b/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java index e93cd7d..626529f 100644 --- a/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.UnsafeUriCharactersEncoder; @@ -31,7 +31,11 @@ import org.apache.camel.util.UnsafeUriCharactersEncoder; * * @version */ -public class TestComponent extends DefaultComponent { +public class TestComponent extends UriEndpointComponent { + + public TestComponent() { + super(TestEndpoint.class); + } public Endpoint createEndpoint(String uri) throws Exception { // lets not use the normal parameter handling so that all parameters are sent to the nested endpoint http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java index 2c70a0e..4ac0eb8 100644 --- a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java @@ -24,6 +24,8 @@ import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.component.seda.SedaConsumer; +import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.util.EndpointHelper; import org.slf4j.Logger; @@ -36,6 +38,7 @@ import org.slf4j.LoggerFactory; * * @version */ +@UriEndpoint(scheme = "test") public class TestEndpoint extends MockEndpoint { private static final Logger LOG = LoggerFactory.getLogger(TestEndpoint.class); private final Endpoint expectedMessageEndpoint; http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java index e047753..5c7adde 100644 --- a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.xml.ResultHandlerFactory; import org.apache.camel.builder.xml.XsltBuilder; import org.apache.camel.builder.xml.XsltUriResolver; import org.apache.camel.converter.jaxp.XmlConverter; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.ResourceHelper; import org.slf4j.Logger; @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; * An <a href="http://camel.apache.org/xslt.html";>XSLT Component</a> * for performing XSLT transforms of messages */ -public class XsltComponent extends DefaultComponent { +public class XsltComponent extends UriEndpointComponent { private static final String SAXON_TRANSFORMER_FACTORY_CLASS_NAME = "net.sf.saxon.TransformerFactoryImpl"; private static final Logger LOG = LoggerFactory.getLogger(XsltComponent.class); @@ -44,6 +44,10 @@ public class XsltComponent extends DefaultComponent { private boolean contentCache = true; private boolean saxon; + public XsltComponent() { + super(XsltEndpoint.class); + } + public XmlConverter getXmlConverter() { return xmlConverter; } http://git-wip-us.apache.org/repos/asf/camel/blob/34f1cf17/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java index 2ea7f60..0e278a3 100644 --- a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java @@ -26,19 +26,25 @@ import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedOperation; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.builder.xml.XsltBuilder; +import org.apache.camel.component.timer.TimerConsumer; import org.apache.camel.impl.ProcessorEndpoint; +import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @ManagedResource(description = "Managed XsltEndpoint") +@UriEndpoint(scheme = "xslt") public class XsltEndpoint extends ProcessorEndpoint { private static final Logger LOG = LoggerFactory.getLogger(XsltEndpoint.class); + private volatile boolean cacheCleared; private XsltBuilder xslt; + @UriParam private String resourceUri; + @UriParam private boolean cacheStylesheet; - private volatile boolean cacheCleared; public XsltEndpoint(String endpointUri, Component component, XsltBuilder xslt, String resourceUri, boolean cacheStylesheet) throws Exception {
