You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/02/10 13:05:29 UTC
[1/8] git commit: Polished
Updated Branches:
refs/heads/camel-2.12.x 49d3d691c -> 9b1e388f2
refs/heads/master 8d3c20956 -> a553aaa8f
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/803c364b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/803c364b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/803c364b
Branch: refs/heads/master
Commit: 803c364bee0f7b0828d8934da0a294ebf14a2e47
Parents: 8d3c209
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 10 11:23:44 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 10 11:23:44 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/impl/DefaultCamelContext.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/803c364b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 6b1e796..6b7a455 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -1031,7 +1031,11 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
String path = CamelContextHelper.COMPONENT_DOCUMENTATION_PREFIX + componentName + ".html";
InputStream inputStream = getClassResolver().loadResourceAsStream(path);
if (inputStream != null) {
- return IOHelper.loadText(inputStream);
+ try {
+ return IOHelper.loadText(inputStream);
+ } finally {
+ IOHelper.close(inputStream);
+ }
}
return null;
}
[2/8] git commit: CAMEL-7186: Added missing @UriParam to some
components in camel-core.
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Mon Feb 10 11:42:39 2014 +0100
Committer: Claus Ibsen <da...@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 {
[6/8] git commit: CAMEL-7186: Added missing @UriParam to some
components in camel-core.
Posted by da...@apache.org.
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/de608c3b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/de608c3b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/de608c3b
Branch: refs/heads/camel-2.12.x
Commit: de608c3b4cd3bcf488cf1f181076b2c6e617f5a5
Parents: c37d952
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 10 11:42:39 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 10 13:06:20 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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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/de608c3b/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 297812d..80d857c 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 {
[4/8] git commit: CAMEL-7185: Fixed apt compile processor to handle
super classes that is generics based.
Posted by da...@apache.org.
CAMEL-7185: Fixed apt compile processor to handle super classes that is generics based.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a553aaa8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a553aaa8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a553aaa8
Branch: refs/heads/master
Commit: a553aaa8f91896b7e8e8e1fb56b3741150d6fe08
Parents: 3a85641
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 10 13:05:41 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 10 13:05:41 2014 +0100
----------------------------------------------------------------------
.../camel/tools/apt/EndpointAnnotationProcessor.java | 7 +++++--
.../java/org/apache/camel/tools/apt/util/Strings.java | 13 +++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a553aaa8/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index b06930d..9879993 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -54,6 +54,8 @@ import org.apache.camel.spi.UriParams;
import org.apache.camel.tools.apt.util.Func1;
import org.apache.camel.tools.apt.util.Strings;
+import static org.apache.camel.tools.apt.util.Strings.canonicalClassName;
+
/**
* Processes all Camel endpoints
*/
@@ -240,7 +242,8 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
TypeElement baseTypeElement = null;
TypeMirror superclass = classElement.getSuperclass();
if (superclass != null) {
- baseTypeElement = findTypeElement(roundEnv, superclass.toString());
+ String superClassName = canonicalClassName(superclass.toString());
+ baseTypeElement = findTypeElement(roundEnv, superClassName);
}
if (baseTypeElement != null) {
classElement = baseTypeElement;
@@ -257,7 +260,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
for (Element rootElement : rootElements) {
if (rootElement instanceof TypeElement) {
TypeElement typeElement = (TypeElement) rootElement;
- String aRootName = typeElement.getQualifiedName().toString();
+ String aRootName = canonicalClassName(typeElement.getQualifiedName().toString());
if (className.equals(aRootName)) {
return typeElement;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a553aaa8/tooling/apt/src/main/java/org/apache/camel/tools/apt/util/Strings.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/util/Strings.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/util/Strings.java
index 74df4dd..bfa8c6b 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/util/Strings.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/util/Strings.java
@@ -36,4 +36,17 @@ public final class Strings {
public static String getOrElse(String text, String defaultValue) {
return (text != null) ? text : defaultValue;
}
+
+ /**
+ * Returns the canonical class name by removing any generic type information.
+ */
+ public static String canonicalClassName(String className) {
+ // remove generics
+ int pos = className.indexOf('<');
+ if (pos != -1) {
+ return className.substring(0, pos);
+ } else {
+ return className;
+ }
+ }
}
[7/8] git commit: CAMEL-7186: Added missing @UriParam to some
components in camel-core.
Posted by da...@apache.org.
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/7ec168b9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ec168b9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ec168b9
Branch: refs/heads/camel-2.12.x
Commit: 7ec168b9901fcf9442955c9b1227d85658f377d5
Parents: de608c3
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 10 12:05:02 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 10 13:06:28 2014 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/ResourceEndpoint.java | 1 +
.../apache/camel/component/browse/BrowseComponent.java | 7 ++++++-
.../apache/camel/component/browse/BrowseEndpoint.java | 4 +++-
.../camel/component/dataformat/DataFormatComponent.java | 9 +++++++--
.../camel/component/dataformat/DataFormatEndpoint.java | 7 ++++++-
.../org/apache/camel/component/mock/MockComponent.java | 8 ++++++--
.../org/apache/camel/component/mock/MockEndpoint.java | 11 +++++++++++
7 files changed, 40 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7ec168b9/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
index 9b3af1d..05358ac 100644
--- a/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
@@ -41,6 +41,7 @@ import org.slf4j.LoggerFactory;
public abstract class ResourceEndpoint extends ProcessorEndpoint implements ManagedResourceEndpointMBean {
protected final Logger log = LoggerFactory.getLogger(getClass());
private volatile byte[] buffer;
+ @UriParam
private String resourceUri;
@UriParam
private boolean contentCache;
http://git-wip-us.apache.org/repos/asf/camel/blob/7ec168b9/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
index fe1d6b2..84bf06f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
@@ -20,13 +20,18 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.UriEndpointComponent;
/**
* The <a href="http://camel.apache.org/browse.html">browse</a> component.
*
* @version
*/
-public class BrowseComponent extends DefaultComponent {
+public class BrowseComponent extends UriEndpointComponent {
+
+ public BrowseComponent() {
+ super(BrowseEndpoint.class);
+ }
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
return new BrowseEndpoint(uri, this);
http://git-wip-us.apache.org/repos/asf/camel/blob/7ec168b9/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
index 3bc9aeb..6eac130 100644
--- a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
@@ -31,6 +31,7 @@ import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.LoadBalancerConsumer;
import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
import org.apache.camel.spi.BrowsableEndpoint;
+import org.apache.camel.spi.UriEndpoint;
/**
* An endpoint which maintains a {@link List} of {@link Exchange} instances
@@ -38,7 +39,8 @@ import org.apache.camel.spi.BrowsableEndpoint;
*
* @version
*/
-public class BrowseEndpoint extends DefaultEndpoint implements BrowsableEndpoint, Service {
+@UriEndpoint(scheme = "browse")
+public class BrowseEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
private List<Exchange> exchanges;
private final LoadBalancer loadBalancer = new TopicLoadBalancer();
http://git-wip-us.apache.org/repos/asf/camel/blob/7ec168b9/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
index f692ab8..62ffc59 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
@@ -19,12 +19,17 @@ package org.apache.camel.component.dataformat;
import java.util.Map;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.component.dataset.DataSetEndpoint;
+import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.EndpointHelper;
import org.apache.camel.util.ObjectHelper;
-public class DataFormatComponent extends DefaultComponent {
+public class DataFormatComponent extends UriEndpointComponent {
+
+ public DataFormatComponent() {
+ 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/7ec168b9/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
index 7304990..1261b2d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
@@ -28,13 +28,18 @@ import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.processor.MarshalProcessor;
import org.apache.camel.processor.UnmarshalProcessor;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
import org.apache.camel.util.ServiceHelper;
+@UriEndpoint(scheme = "dataformat")
public class DataFormatEndpoint extends DefaultEndpoint {
- private DataFormat dataFormat;
private MarshalProcessor marshal;
private UnmarshalProcessor unmarshal;
+ @UriParam
+ private DataFormat dataFormat;
+ @UriParam
private String operation;
public DataFormatEndpoint() {
http://git-wip-us.apache.org/repos/asf/camel/blob/7ec168b9/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
index 0cb58d7..8977918 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
-import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.processor.ThroughputLogger;
import org.apache.camel.util.CamelLogger;
@@ -29,7 +29,11 @@ import org.apache.camel.util.CamelLogger;
*
* @version
*/
-public class MockComponent extends DefaultComponent {
+public class MockComponent extends UriEndpointComponent {
+
+ public MockComponent() {
+ super(MockEndpoint.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/7ec168b9/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index d793b6e..804159b 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -49,6 +49,8 @@ import org.apache.camel.impl.DefaultAsyncProducer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.InterceptSendToEndpoint;
import org.apache.camel.spi.BrowsableEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.CaseInsensitiveMap;
import org.apache.camel.util.ExchangeHelper;
@@ -75,12 +77,14 @@ import org.slf4j.LoggerFactory;
*
* @version
*/
+@UriEndpoint(scheme = "mock")
public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(MockEndpoint.class);
// must be volatile so changes is visible between the thread which performs the assertions
// and the threads which process the exchanges when routing messages in Camel
protected volatile Processor reporter;
protected boolean copyOnExchange = true;
+ @UriParam
private volatile int expectedCount;
private volatile int counter;
private volatile Processor defaultProcessor;
@@ -89,10 +93,15 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
private volatile List<Throwable> failures;
private volatile List<Runnable> tests;
private volatile CountDownLatch latch;
+ @UriParam
private volatile long sleepForEmptyTest;
+ @UriParam
private volatile long resultWaitTime;
+ @UriParam
private volatile long resultMinimumWaitTime;
+ @UriParam
private volatile long assertPeriod;
+ @UriParam
private volatile int expectedMinimumCount;
private volatile List<?> expectedBodyValues;
private volatile List<Object> actualBodyValues;
@@ -100,7 +109,9 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
private volatile Map<String, Object> actualHeaderValues;
private volatile Map<String, Object> expectedPropertyValues;
private volatile Map<String, Object> actualPropertyValues;
+ @UriParam
private volatile int retainFirst;
+ @UriParam
private volatile int retainLast;
public MockEndpoint(String endpointUri, Component component) {
[3/8] git commit: CAMEL-7186: Added missing @UriParam to some
components in camel-core.
Posted by da...@apache.org.
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/3a856415
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3a856415
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3a856415
Branch: refs/heads/master
Commit: 3a8564156782e3e4ed4319480dca139d0b67cc8c
Parents: 34f1cf1
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 10 12:05:02 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 10 12:05:02 2014 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/ResourceEndpoint.java | 1 +
.../apache/camel/component/browse/BrowseComponent.java | 7 ++++++-
.../apache/camel/component/browse/BrowseEndpoint.java | 4 +++-
.../camel/component/dataformat/DataFormatComponent.java | 9 +++++++--
.../camel/component/dataformat/DataFormatEndpoint.java | 7 ++++++-
.../org/apache/camel/component/mock/MockComponent.java | 8 ++++++--
.../org/apache/camel/component/mock/MockEndpoint.java | 11 +++++++++++
7 files changed, 40 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3a856415/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
index 8060c40..2dea113 100644
--- a/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
@@ -41,6 +41,7 @@ import org.slf4j.LoggerFactory;
public abstract class ResourceEndpoint extends ProcessorEndpoint implements ManagedResourceEndpointMBean {
protected final Logger log = LoggerFactory.getLogger(getClass());
private volatile byte[] buffer;
+ @UriParam
private String resourceUri;
@UriParam
private boolean contentCache;
http://git-wip-us.apache.org/repos/asf/camel/blob/3a856415/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
index fe1d6b2..84bf06f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
@@ -20,13 +20,18 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.UriEndpointComponent;
/**
* The <a href="http://camel.apache.org/browse.html">browse</a> component.
*
* @version
*/
-public class BrowseComponent extends DefaultComponent {
+public class BrowseComponent extends UriEndpointComponent {
+
+ public BrowseComponent() {
+ super(BrowseEndpoint.class);
+ }
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
return new BrowseEndpoint(uri, this);
http://git-wip-us.apache.org/repos/asf/camel/blob/3a856415/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
index 3bc9aeb..6eac130 100644
--- a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
@@ -31,6 +31,7 @@ import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.LoadBalancerConsumer;
import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
import org.apache.camel.spi.BrowsableEndpoint;
+import org.apache.camel.spi.UriEndpoint;
/**
* An endpoint which maintains a {@link List} of {@link Exchange} instances
@@ -38,7 +39,8 @@ import org.apache.camel.spi.BrowsableEndpoint;
*
* @version
*/
-public class BrowseEndpoint extends DefaultEndpoint implements BrowsableEndpoint, Service {
+@UriEndpoint(scheme = "browse")
+public class BrowseEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
private List<Exchange> exchanges;
private final LoadBalancer loadBalancer = new TopicLoadBalancer();
http://git-wip-us.apache.org/repos/asf/camel/blob/3a856415/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
index f692ab8..62ffc59 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
@@ -19,12 +19,17 @@ package org.apache.camel.component.dataformat;
import java.util.Map;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.component.dataset.DataSetEndpoint;
+import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.EndpointHelper;
import org.apache.camel.util.ObjectHelper;
-public class DataFormatComponent extends DefaultComponent {
+public class DataFormatComponent extends UriEndpointComponent {
+
+ public DataFormatComponent() {
+ 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/3a856415/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
index ad54ae8..d1ba5ca 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
@@ -27,13 +27,18 @@ import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.processor.MarshalProcessor;
import org.apache.camel.processor.UnmarshalProcessor;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
import org.apache.camel.util.ServiceHelper;
+@UriEndpoint(scheme = "dataformat")
public class DataFormatEndpoint extends DefaultEndpoint {
- private DataFormat dataFormat;
private MarshalProcessor marshal;
private UnmarshalProcessor unmarshal;
+ @UriParam
+ private DataFormat dataFormat;
+ @UriParam
private String operation;
public DataFormatEndpoint() {
http://git-wip-us.apache.org/repos/asf/camel/blob/3a856415/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
index 0cb58d7..8977918 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
-import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.processor.ThroughputLogger;
import org.apache.camel.util.CamelLogger;
@@ -29,7 +29,11 @@ import org.apache.camel.util.CamelLogger;
*
* @version
*/
-public class MockComponent extends DefaultComponent {
+public class MockComponent extends UriEndpointComponent {
+
+ public MockComponent() {
+ super(MockEndpoint.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/3a856415/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index d793b6e..804159b 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -49,6 +49,8 @@ import org.apache.camel.impl.DefaultAsyncProducer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.InterceptSendToEndpoint;
import org.apache.camel.spi.BrowsableEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.CaseInsensitiveMap;
import org.apache.camel.util.ExchangeHelper;
@@ -75,12 +77,14 @@ import org.slf4j.LoggerFactory;
*
* @version
*/
+@UriEndpoint(scheme = "mock")
public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(MockEndpoint.class);
// must be volatile so changes is visible between the thread which performs the assertions
// and the threads which process the exchanges when routing messages in Camel
protected volatile Processor reporter;
protected boolean copyOnExchange = true;
+ @UriParam
private volatile int expectedCount;
private volatile int counter;
private volatile Processor defaultProcessor;
@@ -89,10 +93,15 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
private volatile List<Throwable> failures;
private volatile List<Runnable> tests;
private volatile CountDownLatch latch;
+ @UriParam
private volatile long sleepForEmptyTest;
+ @UriParam
private volatile long resultWaitTime;
+ @UriParam
private volatile long resultMinimumWaitTime;
+ @UriParam
private volatile long assertPeriod;
+ @UriParam
private volatile int expectedMinimumCount;
private volatile List<?> expectedBodyValues;
private volatile List<Object> actualBodyValues;
@@ -100,7 +109,9 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
private volatile Map<String, Object> actualHeaderValues;
private volatile Map<String, Object> expectedPropertyValues;
private volatile Map<String, Object> actualPropertyValues;
+ @UriParam
private volatile int retainFirst;
+ @UriParam
private volatile int retainLast;
public MockEndpoint(String endpointUri, Component component) {
[5/8] git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c37d9524
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c37d9524
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c37d9524
Branch: refs/heads/camel-2.12.x
Commit: c37d9524dc8965040f062bf023328cfa40cb29c2
Parents: 49d3d69
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 10 11:23:44 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 10 13:06:12 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/impl/DefaultCamelContext.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c37d9524/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index ac706ba..d916b56 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -1032,7 +1032,11 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
String path = CamelContextHelper.COMPONENT_DOCUMENTATION_PREFIX + componentName + ".html";
InputStream inputStream = getClassResolver().loadResourceAsStream(path);
if (inputStream != null) {
- return IOHelper.loadText(inputStream);
+ try {
+ return IOHelper.loadText(inputStream);
+ } finally {
+ IOHelper.close(inputStream);
+ }
}
return null;
}
[8/8] git commit: CAMEL-7185: Fixed apt compile processor to handle
super classes that is generics based.
Posted by da...@apache.org.
CAMEL-7185: Fixed apt compile processor to handle super classes that is generics based.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9b1e388f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b1e388f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b1e388f
Branch: refs/heads/camel-2.12.x
Commit: 9b1e388f2d9c5ca10101babe5d6aba4ef60b7d82
Parents: 7ec168b
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 10 13:05:41 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 10 13:06:34 2014 +0100
----------------------------------------------------------------------
.../camel/tools/apt/EndpointAnnotationProcessor.java | 7 +++++--
.../java/org/apache/camel/tools/apt/util/Strings.java | 13 +++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9b1e388f/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index b06930d..9879993 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -54,6 +54,8 @@ import org.apache.camel.spi.UriParams;
import org.apache.camel.tools.apt.util.Func1;
import org.apache.camel.tools.apt.util.Strings;
+import static org.apache.camel.tools.apt.util.Strings.canonicalClassName;
+
/**
* Processes all Camel endpoints
*/
@@ -240,7 +242,8 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
TypeElement baseTypeElement = null;
TypeMirror superclass = classElement.getSuperclass();
if (superclass != null) {
- baseTypeElement = findTypeElement(roundEnv, superclass.toString());
+ String superClassName = canonicalClassName(superclass.toString());
+ baseTypeElement = findTypeElement(roundEnv, superClassName);
}
if (baseTypeElement != null) {
classElement = baseTypeElement;
@@ -257,7 +260,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
for (Element rootElement : rootElements) {
if (rootElement instanceof TypeElement) {
TypeElement typeElement = (TypeElement) rootElement;
- String aRootName = typeElement.getQualifiedName().toString();
+ String aRootName = canonicalClassName(typeElement.getQualifiedName().toString());
if (className.equals(aRootName)) {
return typeElement;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9b1e388f/tooling/apt/src/main/java/org/apache/camel/tools/apt/util/Strings.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/util/Strings.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/util/Strings.java
index 74df4dd..bfa8c6b 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/util/Strings.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/util/Strings.java
@@ -36,4 +36,17 @@ public final class Strings {
public static String getOrElse(String text, String defaultValue) {
return (text != null) ? text : defaultValue;
}
+
+ /**
+ * Returns the canonical class name by removing any generic type information.
+ */
+ public static String canonicalClassName(String className) {
+ // remove generics
+ int pos = className.indexOf('<');
+ if (pos != -1) {
+ return className.substring(0, pos);
+ } else {
+ return className;
+ }
+ }
}