Repository: camel Updated Branches: refs/heads/master 4977fbc03 -> 1387f62e9
CAMEL-10629: Add more details to component level options Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1387f62e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1387f62e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1387f62e Branch: refs/heads/master Commit: 1387f62e9709e04b8fe30204272dbf2bfcc7d6bc Parents: 4977fbc Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Dec 21 16:58:45 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Dec 21 16:58:45 2016 +0100 ---------------------------------------------------------------------- .../impl/HeaderFilterStrategyComponent.java | 4 +++- .../springboot/AhcComponentConfiguration.java | 4 ++-- .../ws/springboot/WsComponentConfiguration.java | 4 ++-- .../WebsocketComponentConfiguration.java | 4 ++-- .../springboot/CxfRsComponentConfiguration.java | 4 ++-- .../springboot/CxfComponentConfiguration.java | 4 ++-- .../springboot/HttpComponentConfiguration.java | 4 ++-- .../springboot/HttpComponentConfiguration.java | 8 +++---- .../JettyHttpComponentConfiguration9.java | 10 ++++----- .../NettyHttpComponentConfiguration.java | 2 +- .../springboot/NettyComponentConfiguration.java | 2 +- .../QuartzComponentConfiguration.java | 6 +++--- .../RestletComponentConfiguration.java | 4 ++-- .../ServletComponentConfiguration.java | 4 ++-- .../springboot/SjmsComponentConfiguration.java | 2 +- .../springboot/VertxComponentConfiguration.java | 2 +- .../WebsocketComponentConfiguration.java | 4 ++-- .../src/main/docs/ahc-ws-component.adoc | 2 +- .../camel-ahc/src/main/docs/ahc-component.adoc | 2 +- .../docs/atmosphere-websocket-component.adoc | 2 +- .../camel-cxf/src/main/docs/cxf-component.adoc | 2 +- .../src/main/docs/cxfrs-component.adoc | 2 +- .../src/main/docs/http-component.adoc | 2 +- .../src/main/docs/http4-component.adoc | 2 +- .../src/main/docs/jetty-component.adoc | 2 +- .../src/main/docs/restlet-component.adoc | 4 ++-- .../src/main/docs/xquery-component.adoc | 10 ++++----- .../src/main/docs/servlet-component.adoc | 2 +- .../camel-ssh/src/main/docs/ssh-component.adoc | 11 +++++----- .../src/main/docs/telegram-component.adoc | 4 ++-- .../component/telegram/TelegramComponent.java | 2 ++ .../telegram/TelegramConfiguration.java | 2 +- .../component/undertow/UndertowComponent.java | 6 +++++- .../component/velocity/VelocityComponent.java | 3 +++ .../camel/component/vertx/VertxComponent.java | 7 ++++++- .../component/weather/WeatherConfiguration.java | 5 ++--- .../component/websocket/WebsocketComponent.java | 22 ++++++++++++++------ .../xmlsecurity/XmlSignatureComponent.java | 3 +++ .../src/main/docs/yammer-component.adoc | 6 +++--- .../camel/component/yammer/YammerComponent.java | 5 +++++ .../component/yammer/YammerConfiguration.java | 6 +++--- .../component/zookeeper/ZooKeeperComponent.java | 2 ++ 42 files changed, 112 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java b/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java index b1c4bfc..903444b 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java @@ -20,12 +20,14 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; +import org.apache.camel.spi.Metadata; /** * Base class for components to support configuring a {@link org.apache.camel.spi.HeaderFilterStrategy}. */ public abstract class HeaderFilterStrategyComponent extends UriEndpointComponent implements HeaderFilterStrategyAware { - + + @Metadata(label = "filter", description = "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.") private HeaderFilterStrategy headerFilterStrategy; public HeaderFilterStrategyComponent(Class<? extends Endpoint> endpointClass) { http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java b/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java index 078b3bc..25d1680 100644 --- a/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java +++ b/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java @@ -66,8 +66,8 @@ public class AhcComponentConfiguration { */ private Boolean allowJavaSerializedObject; /** - * To use a custom HeaderFilterStrategy to filter header to and from Camel - * message. + * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter + * header to and from Camel message. */ @NestedConfigurationProperty private HeaderFilterStrategy headerFilterStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java b/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java index a894dd3..e5e7c78 100644 --- a/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java +++ b/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java @@ -66,8 +66,8 @@ public class WsComponentConfiguration { */ private Boolean allowJavaSerializedObject; /** - * To use a custom HeaderFilterStrategy to filter header to and from Camel - * message. + * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter + * header to and from Camel message. */ @NestedConfigurationProperty private HeaderFilterStrategy headerFilterStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java index 147e58a..64598cc 100644 --- a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java +++ b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java @@ -69,8 +69,8 @@ public class WebsocketComponentConfiguration { */ private Boolean allowJavaSerializedObject; /** - * To use a custom HeaderFilterStrategy to filter header to and from Camel - * message. + * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter + * header to and from Camel message. */ @NestedConfigurationProperty private HeaderFilterStrategy headerFilterStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConfiguration.java b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConfiguration.java index d84a116..3066477 100644 --- a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConfiguration.java +++ b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConfiguration.java @@ -29,8 +29,8 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; public class CxfRsComponentConfiguration { /** - * To use a custom HeaderFilterStrategy to filter header to and from Camel - * message. + * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter + * header to and from Camel message. */ @NestedConfigurationProperty private HeaderFilterStrategy headerFilterStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConfiguration.java b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConfiguration.java index a2a3dac..d8b9f87 100644 --- a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConfiguration.java +++ b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConfiguration.java @@ -36,8 +36,8 @@ public class CxfComponentConfiguration { */ private Boolean allowStreaming; /** - * To use a custom HeaderFilterStrategy to filter header to and from Camel - * message. + * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter + * header to and from Camel message. */ @NestedConfigurationProperty private HeaderFilterStrategy headerFilterStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java index acf31ee..c610bd1 100644 --- a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java +++ b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java @@ -63,8 +63,8 @@ public class HttpComponentConfiguration { */ private Boolean allowJavaSerializedObject; /** - * To use a custom HeaderFilterStrategy to filter header to and from Camel - * message. + * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter + * header to and from Camel message. */ @NestedConfigurationProperty private HeaderFilterStrategy headerFilterStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java b/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java index eacaa37..ee362b8 100644 --- a/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java +++ b/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java @@ -90,11 +90,11 @@ public class HttpComponentConfiguration { /** * The maximum number of connections. */ - private Integer maxTotalConnections; + private Integer maxTotalConnections = 200; /** * The maximum number of connections per route. */ - private Integer connectionsPerRoute; + private Integer connectionsPerRoute = 20; /** * The time for connection to live the time unit is millisecond the default * value is always keep alive. @@ -110,8 +110,8 @@ public class HttpComponentConfiguration { @NestedConfigurationProperty private CookieStore cookieStore; /** - * To use a custom HeaderFilterStrategy to filter header to and from Camel - * message. + * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter + * header to and from Camel message. */ @NestedConfigurationProperty private HeaderFilterStrategy headerFilterStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java b/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java index 42f4060..77ada7a 100644 --- a/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java +++ b/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java @@ -138,11 +138,11 @@ public class JettyHttpComponentConfiguration9 { * return back a http error 503 to the client. This option is only in use * when using Jetty with the Asynchronous Routing Engine. */ - private Long continuationTimeout; + private Long continuationTimeout = 30000L; /** * Whether or not to use Jetty continuations for the Jetty Server. */ - private Boolean useContinuation; + private Boolean useContinuation = true; /** * To configure security using SSLContextParameters */ @@ -186,7 +186,7 @@ public class JettyHttpComponentConfiguration9 { * other camel-jetty endpoint is share the same port otherwise this option * may not work as expected. */ - private Boolean sendServerVersion; + private Boolean sendServerVersion = true; /** * Whether to allow java serialization when a request uses * context-type=application/x-java-serialized-object This is by default @@ -196,8 +196,8 @@ public class JettyHttpComponentConfiguration9 { */ private Boolean allowJavaSerializedObject; /** - * To use a custom HeaderFilterStrategy to filter header to and from Camel - * message. + * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter + * header to and from Camel message. */ @NestedConfigurationProperty private HeaderFilterStrategy headerFilterStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java b/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java index 4746c1d..781a81b 100644 --- a/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java +++ b/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java @@ -59,7 +59,7 @@ public class NettyHttpComponentConfiguration { * The thread pool size for the EventExecutorGroup if its in use. The * default value is 16. */ - private Integer maximumPoolSize; + private Integer maximumPoolSize = 16; /** * To use the given EventExecutorGroup */ http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java b/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java index fb5f59d..c4dd3f9 100644 --- a/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java +++ b/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java @@ -47,7 +47,7 @@ public class NettyComponentConfiguration { * The thread pool size for the EventExecutorGroup if its in use. The * default value is 16. */ - private Integer maximumPoolSize; + private Integer maximumPoolSize = 16; /** * To use the NettyConfiguration as configuration when creating endpoints. */ http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java b/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java index db3abee..388791a 100644 --- a/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java +++ b/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java @@ -34,7 +34,7 @@ public class QuartzComponentConfiguration { * Whether or not the scheduler should be auto started. This options is * default true */ - private Boolean autoStartScheduler; + private Boolean autoStartScheduler = true; /** * Seconds to wait before starting the quartz scheduler. */ @@ -48,7 +48,7 @@ public class QuartzComponentConfiguration { * Whether to enable Quartz JMX which allows to manage the Quartz scheduler * from JMX. This options is default true */ - private Boolean enableJmx; + private Boolean enableJmx = true; /** * Properties to configure the Quartz scheduler. */ @@ -64,7 +64,7 @@ public class QuartzComponentConfiguration { * to false to reuse Quartz scheduler instances between multiple * CamelContext's. */ - private Boolean prefixInstanceName; + private Boolean prefixInstanceName = true; /** * To use the custom SchedulerFactory which is used to create the Scheduler. */ http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-restlet-starter/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-restlet-starter/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentConfiguration.java b/components-starter/camel-restlet-starter/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentConfiguration.java index 83f53e3..b17f79f 100644 --- a/components-starter/camel-restlet-starter/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentConfiguration.java +++ b/components-starter/camel-restlet-starter/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentConfiguration.java @@ -129,8 +129,8 @@ public class RestletComponentConfiguration { */ private List<String> enabledConverters; /** - * To use a custom HeaderFilterStrategy to filter header to and from Camel - * message. + * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter + * header to and from Camel message. */ @NestedConfigurationProperty private HeaderFilterStrategy headerFilterStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java index 95cdf88..db6c7e4 100644 --- a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java +++ b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java @@ -70,8 +70,8 @@ public class ServletComponentConfiguration { */ private Boolean allowJavaSerializedObject; /** - * To use a custom HeaderFilterStrategy to filter header to and from Camel - * message. + * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter + * header to and from Camel message. */ @NestedConfigurationProperty private HeaderFilterStrategy headerFilterStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentConfiguration.java b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentConfiguration.java index cc9f895..0035ed3 100644 --- a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentConfiguration.java +++ b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentConfiguration.java @@ -57,7 +57,7 @@ public class SjmsComponentConfiguration { * The maximum number of connections available to endpoints started under * this component */ - private Integer connectionCount; + private Integer connectionCount = 1; /** * Pluggable strategy for encoding and decoding JMS keys so they can be * compliant with the JMS specification. Camel provides one implementation http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConfiguration.java b/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConfiguration.java index 29bb37a..c8df960 100644 --- a/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConfiguration.java +++ b/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConfiguration.java @@ -59,7 +59,7 @@ public class VertxComponentConfiguration { * Timeout in seconds to wait for clustered Vertx EventBus to be ready. The * default value is 60. */ - private Integer timeout; + private Integer timeout = 60; public VertxFactory getVertxFactory() { return vertxFactory; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java b/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java index bf13ca8..1ef60e1 100644 --- a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java +++ b/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java @@ -44,11 +44,11 @@ public class WebsocketComponentConfiguration { /** * The hostname. The default value is 0.0.0.0 */ - private String host; + private String host = "0.0.0.0"; /** * The port number. The default value is 9292 */ - private Integer port; + private Integer port = 9292; /** * The password for the keystore when using SSL. */ http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc index c857ed0..5768333 100644 --- a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc +++ b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc @@ -60,7 +60,7 @@ The AHC Websocket component supports 6 options which are listed below. | clientConfig | AsyncHttpClientConfig | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | sslContextParameters | SSLContextParameters | Reference to a org.apache.camel.util.jsse.SSLContextParameters in the Registry. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | allowJavaSerializedObject | boolean | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. -| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. +| headerFilterStrategy | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |======================================================================= {% endraw %} // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-ahc/src/main/docs/ahc-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc b/components/camel-ahc/src/main/docs/ahc-component.adoc index c9fab73..17bbe52 100644 --- a/components/camel-ahc/src/main/docs/ahc-component.adoc +++ b/components/camel-ahc/src/main/docs/ahc-component.adoc @@ -107,7 +107,7 @@ The AHC component supports 6 options which are listed below. | clientConfig | AsyncHttpClientConfig | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | sslContextParameters | SSLContextParameters | Reference to a org.apache.camel.util.jsse.SSLContextParameters in the Registry. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | allowJavaSerializedObject | boolean | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. -| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. +| headerFilterStrategy | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |======================================================================= {% endraw %} // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc index 6bc2297..55ab94c 100644 --- a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc +++ b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc @@ -52,7 +52,7 @@ The Atmosphere Websocket component supports 7 options which are listed below. | httpBinding | HttpBinding | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | httpConfiguration | HttpConfiguration | To use the shared HttpConfiguration as base configuration. | allowJavaSerializedObject | boolean | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. -| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. +| headerFilterStrategy | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |======================================================================= {% endraw %} // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-cxf/src/main/docs/cxf-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc b/components/camel-cxf/src/main/docs/cxf-component.adoc index a7d42d9..41eabbd 100644 --- a/components/camel-cxf/src/main/docs/cxf-component.adoc +++ b/components/camel-cxf/src/main/docs/cxf-component.adoc @@ -133,7 +133,7 @@ The CXF component supports 2 options which are listed below. |======================================================================= | Name | Java Type | Description | allowStreaming | Boolean | This option controls whether the CXF component when running in PAYLOAD mode will DOM parse the incoming messages into DOM Elements or keep the payload as a javax.xml.transform.Source object that would allow streaming in some cases. -| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. +| headerFilterStrategy | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |======================================================================= {% endraw %} // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-cxf/src/main/docs/cxfrs-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/docs/cxfrs-component.adoc b/components/camel-cxf/src/main/docs/cxfrs-component.adoc index 3836666..41b04ac 100644 --- a/components/camel-cxf/src/main/docs/cxfrs-component.adoc +++ b/components/camel-cxf/src/main/docs/cxfrs-component.adoc @@ -72,7 +72,7 @@ The CXF-RS component supports 1 options which are listed below. [width="100%",cols="2,1m,7",options="header"] |======================================================================= | Name | Java Type | Description -| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. +| headerFilterStrategy | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |======================================================================= {% endraw %} // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-http/src/main/docs/http-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc index fe0e6a1..e4ce46a 100644 --- a/components/camel-http/src/main/docs/http-component.adoc +++ b/components/camel-http/src/main/docs/http-component.adoc @@ -133,7 +133,7 @@ The HTTP component supports 6 options which are listed below. | httpBinding | HttpBinding | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | httpConfiguration | HttpConfiguration | To use the shared HttpConfiguration as base configuration. | allowJavaSerializedObject | boolean | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. -| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. +| headerFilterStrategy | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |======================================================================= {% endraw %} // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-http4/src/main/docs/http4-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/docs/http4-component.adoc b/components/camel-http4/src/main/docs/http4-component.adoc index c45269d..b22346e 100644 --- a/components/camel-http4/src/main/docs/http4-component.adoc +++ b/components/camel-http4/src/main/docs/http4-component.adoc @@ -77,7 +77,7 @@ The HTTP4 component supports 13 options which are listed below. | connectionsPerRoute | int | The maximum number of connections per route. | connectionTimeToLive | long | The time for connection to live the time unit is millisecond the default value is always keep alive. | cookieStore | CookieStore | To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). -| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. +| headerFilterStrategy | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |======================================================================= {% endraw %} // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-jetty9/src/main/docs/jetty-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc b/components/camel-jetty9/src/main/docs/jetty-component.adoc index 9aae5a7..816be63 100644 --- a/components/camel-jetty9/src/main/docs/jetty-component.adoc +++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc @@ -92,7 +92,7 @@ The Jetty 9 component supports 31 options which are listed below. | useXForwardedForHeader | boolean | To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr. | sendServerVersion | boolean | If the option is true jetty server will send the date header to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port otherwise this option may not work as expected. | allowJavaSerializedObject | boolean | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. -| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. +| headerFilterStrategy | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |======================================================================= {% endraw %} // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-restlet/src/main/docs/restlet-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-restlet/src/main/docs/restlet-component.adoc b/components/camel-restlet/src/main/docs/restlet-component.adoc index 779addf..96039ca 100644 --- a/components/camel-restlet/src/main/docs/restlet-component.adoc +++ b/components/camel-restlet/src/main/docs/restlet-component.adoc @@ -93,7 +93,7 @@ The Restlet component supports 20 options which are listed below. | port | int | To configure the port number for the restlet consumer routes. This allows to configure this once to reuse the same port for these consumers. | synchronous | Boolean | Whether to use synchronous Restlet Client for the producer. Setting this option to true can yield faster performance as it seems the Restlet synchronous Client works better. | enabledConverters | List | A list of converters to enable as full class name or simple class name. All the converters automatically registered are enabled if empty or null -| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. +| headerFilterStrategy | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |======================================================================= {% endraw %} // component options: END @@ -116,6 +116,7 @@ The Restlet component supports 22 endpoint options which are listed below: | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored. | restletMethods | consumer | | String | Specify one or more methods separated by commas (e.g. restletMethods=postput) to be serviced by a restlet consumer endpoint. If both restletMethod and restletMethods options are specified the restletMethod setting is ignored. The possible methods are: ALLCONNECTDELETEGETHEADOPTIONSPATCHPOSTPUTTRACE | restletUriPatterns | consumer | | List | Specify one ore more URI templates to be serviced by a restlet consumer endpoint using the notation to reference a List in the Camel Registry. If a URI pattern has been defined in the endpoint URI both the URI pattern defined in the endpoint and the restletUriPatterns option will be honored. +| disableStreamCache | consumer (advanced) | false | boolean | Determines whether or not the raw input stream from Restlet is cached or not (Camel will read the stream into a in memory/overflow to file Stream caching) cache. By default Camel will cache the Restlet input stream to support reading it multiple times to ensure Camel can retrieve all data from the stream. However you can set this option to true when you for example need to access the raw stream such as streaming it directly to a file or other persistent store. DefaultRestletBinding will copy the request input stream into a stream cache and put it into message body if this option is false to support reading the stream multiple times. | exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR level and ignored. | exchangePattern | consumer (advanced) | | ExchangePattern | Sets the exchange pattern when the consumer creates an exchange. | connectTimeout | producer | 30000 | int | The Client will give up connection if the connection is timeout 0 for unlimited wait. @@ -124,7 +125,6 @@ The Restlet component supports 22 endpoint options which are listed below: | throwExceptionOnFailure | producer | true | boolean | Whether to throw exception on a producer failure. If this option is false then the http status code is set as a message header which can be checked if it has an error value. | autoCloseStream | producer (advanced) | false | boolean | Whether to auto close the stream representation as response from calling a REST service using the restlet producer. If the response is streaming and the option streamRepresentation is enabled then you may want to auto close the InputStream from the streaming response to ensure the input stream is closed when the Camel Exchange is done being routed. However if you need to read the stream outside a Camel route you may need to not auto close the stream. | streamRepresentation | producer (advanced) | false | boolean | Whether to support stream representation as response from calling a REST service using the restlet producer. If the response is streaming then this option can be enabled to use an java.io.InputStream as the message body on the Camel Message body. If using this option you may want to enable the autoCloseStream option as well to ensure the input stream is closed when the Camel Exchange is done being routed. However if you need to read the stream outside a Camel route you may need to not auto close the stream. -| disableStreamCache | advanced | false | boolean | Determines whether or not the raw input stream from Restlet is cached or not (Camel will read the stream into a in memory/overflow to file Stream caching) cache. By default Camel will cache the Restlet input stream to support reading it multiple times to ensure Camel can retrieve all data from the stream. However you can set this option to true when you for example need to access the raw stream such as streaming it directly to a file or other persistent store. DefaultRestletBinding will copy the request input stream into a stream cache and put it into message body if this option is false to support reading the stream multiple times. | headerFilterStrategy | advanced | | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | restletBinding | advanced | | RestletBinding | To use a custom RestletBinding to bind between Restlet and Camel message. | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-saxon/src/main/docs/xquery-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-saxon/src/main/docs/xquery-component.adoc b/components/camel-saxon/src/main/docs/xquery-component.adoc index 9258af9..79c2c79 100644 --- a/components/camel-saxon/src/main/docs/xquery-component.adoc +++ b/components/camel-saxon/src/main/docs/xquery-component.adoc @@ -42,21 +42,21 @@ The XQuery component supports 31 endpoint options which are listed below: | Name | Group | Default | Java Type | Description | resourceUri | common | | String | *Required* The name of the template to load from classpath or file system | allowStAX | common | false | boolean | Whether to allow using StAX mode -| configuration | common | | Configuration | To use a custom Saxon configuration | headerName | common | | String | To use a Camel Message header as the input source instead of Message body. -| moduleURIResolver | common | | ModuleURIResolver | To use the custom ModuleURIResolver | namespacePrefixes | common | | Map | Allows to control which namespace prefixes to use for a set of namespace mappings -| parameters | common | | Map | Additional parameters -| properties | common | | Properties | Properties to configure the serialization parameters | resultsFormat | common | DOM | ResultFormat | What output result to use | resultType | common | | Class<?> | What output result to use defined as a class -| staticQueryContext | common | | StaticQueryContext | To use a custom Saxon StaticQueryContext | stripsAllWhiteSpace | common | true | boolean | Whether to strip all whitespaces | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored. | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling consumer did not poll any files you can enable this option to send an empty message (no body) instead. | exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR level and ignored. | exchangePattern | consumer (advanced) | | ExchangePattern | Sets the exchange pattern when the consumer creates an exchange. | pollStrategy | consumer (advanced) | | PollingConsumerPollStrategy | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. +| configuration | advanced | | Configuration | To use a custom Saxon configuration +| moduleURIResolver | advanced | | ModuleURIResolver | To use the custom ModuleURIResolver +| parameters | advanced | | Map | Additional parameters +| properties | advanced | | Properties | Properties to configure the serialization parameters +| staticQueryContext | advanced | | StaticQueryContext | To use a custom Saxon StaticQueryContext | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | backoffErrorThreshold | scheduler | | int | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | backoffIdleThreshold | scheduler | | int | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-servlet/src/main/docs/servlet-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-servlet/src/main/docs/servlet-component.adoc b/components/camel-servlet/src/main/docs/servlet-component.adoc index c13599c..cc715b5 100644 --- a/components/camel-servlet/src/main/docs/servlet-component.adoc +++ b/components/camel-servlet/src/main/docs/servlet-component.adoc @@ -60,7 +60,7 @@ The Servlet component supports 7 options which are listed below. | httpBinding | HttpBinding | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | httpConfiguration | HttpConfiguration | To use the shared HttpConfiguration as base configuration. | allowJavaSerializedObject | boolean | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. -| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. +| headerFilterStrategy | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |======================================================================= {% endraw %} // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-ssh/src/main/docs/ssh-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-ssh/src/main/docs/ssh-component.adoc b/components/camel-ssh/src/main/docs/ssh-component.adoc index d8913a7..f75244b 100644 --- a/components/camel-ssh/src/main/docs/ssh-component.adoc +++ b/components/camel-ssh/src/main/docs/ssh-component.adoc @@ -63,7 +63,7 @@ The SSH component supports 11 options which are listed below. // endpoint options: START -The SSH component supports 27 endpoint options which are listed below: +The SSH component supports 28 endpoint options which are listed below: {% raw %} [width="100%",cols="2,1,1m,1m,5",options="header"] @@ -71,11 +71,7 @@ The SSH component supports 27 endpoint options which are listed below: | Name | Group | Default | Java Type | Description | host | common | | String | *Required* Sets the hostname of the remote SSH server. | port | common | 22 | int | Sets the port number for the remote SSH server. -| certResource | common | | String | Sets the resource path of the certificate to use for Authentication. Will use ResourceHelperKeyPairProvider to resolve file based certificate and depends on keyType setting. -| keyType | common | ssh-rsa | String | Sets the key type to pass to the KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...) will be passed this value. Defaults to ssh-rsa. -| password | common | | String | Sets the password to use in connecting to remote SSH server. Requires keyPairProvider to be set to null. | timeout | common | 30000 | long | Sets the timeout in milliseconds to wait in establishing the remote SSH server connection. Defaults to 30000 milliseconds. -| username | common | | String | Sets the username to use in logging into the remote SSH server. | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored. | pollCommand | consumer | | String | Sets the command string to send to the remote SSH server during every poll cycle. Only works with camel-ssh component being used as a consumer i.e. from(ssh://...) You may need to end your command with a newline and that must be URL encoded 0A | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling consumer did not poll any files you can enable this option to send an empty message (no body) instead. @@ -96,6 +92,11 @@ The SSH component supports 27 endpoint options which are listed below: | startScheduler | scheduler | true | boolean | Whether the scheduler should be auto started. | timeUnit | scheduler | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay options. | useFixedDelay | scheduler | true | boolean | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. +| certResource | security | | String | Sets the resource path of the certificate to use for Authentication. Will use ResourceHelperKeyPairProvider to resolve file based certificate and depends on keyType setting. +| keyPairProvider | security | | KeyPairProvider | Sets the KeyPairProvider reference to use when connecting using Certificates to the remote SSH Server. +| keyType | security | ssh-rsa | String | Sets the key type to pass to the KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...) will be passed this value. Defaults to ssh-rsa. +| password | security | | String | Sets the password to use in connecting to remote SSH server. Requires keyPairProvider to be set to null. +| username | security | | String | Sets the username to use in logging into the remote SSH server. |======================================================================= {% endraw %} // endpoint options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-telegram/src/main/docs/telegram-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-telegram/src/main/docs/telegram-component.adoc b/components/camel-telegram/src/main/docs/telegram-component.adoc index 2d79320..f194617 100644 --- a/components/camel-telegram/src/main/docs/telegram-component.adoc +++ b/components/camel-telegram/src/main/docs/telegram-component.adoc @@ -72,7 +72,7 @@ The Telegram component supports 24 endpoint options which are listed below: |======================================================================= | Name | Group | Default | Java Type | Description | type | common | | String | *Required* The endpoint type. Currently only the 'bots' type is supported. -| authorizationToken | common | | String | *Required* The authorization token for using the bot (ask the BotFather) eg. 654321531:HGF_dTra456323dHuOedsE343211fqr3t-H. +| authorizationToken | security | | String | *Required* The authorization token for using the bot (ask the BotFather) eg. 654321531:HGF_dTra456323dHuOedsE343211fqr3t-H. | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored. | limit | consumer | 100 | Integer | Limit on the number of updates that can be received in a single polling request. | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling consumer did not poll any files you can enable this option to send an empty message (no body) instead. @@ -308,4 +308,4 @@ from("timer:tick") to("telegram:bots/123456789:AAE_dLq5C19xwGjw3yiC2NvEUrZcejK21-Q987654321:AAE_dLq5C19xwOmg5yiC2NvSrkT3wj5Q1-L?chatId=123456") --------------------------------------------------------- -Note that the corresponding URI parameter is simply `chatId`. \ No newline at end of file +Note that the corresponding URI parameter is simply `chatId`. http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java index 330fa1f..07d5d6e 100644 --- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java +++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java @@ -20,12 +20,14 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; /** * The Camel component for Telegram. */ public class TelegramComponent extends UriEndpointComponent { + @Metadata(label = "security") private String authorizationToken; public TelegramComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramConfiguration.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramConfiguration.java index c2181c9..6e52fd4 100644 --- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramConfiguration.java +++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramConfiguration.java @@ -33,7 +33,7 @@ public class TelegramConfiguration { @Metadata(required = "true") private String type; - @UriPath(description = "The authorization token for using the bot (ask the BotFather), eg. 654321531:HGF_dTra456323dHuOedsE343211fqr3t-H.") + @UriPath(label = "security", description = "The authorization token for using the bot (ask the BotFather), eg. 654321531:HGF_dTra456323dHuOedsE343211fqr3t-H.") @Metadata(required = "true") private String authorizationToken; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java index ece4998..f9dc6ca 100644 --- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java +++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java @@ -29,6 +29,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RestApiConsumerFactory; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spi.RestConsumerFactory; @@ -50,8 +51,11 @@ import org.slf4j.LoggerFactory; public class UndertowComponent extends UriEndpointComponent implements RestConsumerFactory, RestApiConsumerFactory, RestProducerFactory { private static final Logger LOG = LoggerFactory.getLogger(UndertowEndpoint.class); - private UndertowHttpBinding undertowHttpBinding; private Map<UndertowHostKey, UndertowHost> undertowRegistry = new ConcurrentHashMap<UndertowHostKey, UndertowHost>(); + + @Metadata(label = "advanced") + private UndertowHttpBinding undertowHttpBinding; + @Metadata(label = "security") private SSLContextParameters sslContextParameters; public UndertowComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java index 3dfd850..da02a84 100644 --- a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java +++ b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java @@ -20,6 +20,7 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ResourceHelper; import org.apache.velocity.app.VelocityEngine; @@ -27,6 +28,8 @@ import org.apache.velocity.app.VelocityEngine; * @version */ public class VelocityComponent extends UriEndpointComponent { + + @Metadata(label = "advanced") private VelocityEngine velocityEngine; public VelocityComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java index 2478c24..06d2f0b 100644 --- a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java +++ b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java @@ -32,6 +32,7 @@ import org.apache.camel.ComponentConfiguration; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.spi.EndpointCompleter; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,11 +42,15 @@ import org.slf4j.LoggerFactory; */ public class VertxComponent extends UriEndpointComponent implements EndpointCompleter { private static final Logger LOG = LoggerFactory.getLogger(VertxComponent.class); - private VertxFactory vertxFactory; + private volatile boolean createdVertx; + + @Metadata(label = "advanced") + private VertxFactory vertxFactory; private Vertx vertx; private String host; private int port; + @Metadata(defaultValue = "60") private int timeout = 60; private VertxOptions vertxOptions; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java b/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java index 7066498..36feb71 100644 --- a/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java +++ b/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java @@ -80,9 +80,9 @@ public class WeatherConfiguration { private Integer proxyPort; @UriParam(label = "proxy") private String proxyAuthMethod; - @UriParam(label = "proxy") + @UriParam(label = "proxy", secret = true) private String proxyAuthUsername; - @UriParam(label = "proxy") + @UriParam(label = "proxy", secret = true) private String proxyAuthPassword; @UriParam(label = "proxy") private String proxyAuthDomain; @@ -91,7 +91,6 @@ public class WeatherConfiguration { @UriParam(label = "advanced") private HttpConnectionManager httpConnectionManager; - public WeatherConfiguration(WeatherComponent component) { this.component = notNull(component, "component"); weatherQuery = new WeatherQuery(this); http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java index ab85381..7e61c07 100644 --- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java +++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java @@ -28,6 +28,7 @@ import javax.servlet.DispatcherType; import org.apache.camel.Endpoint; import org.apache.camel.RuntimeCamelException; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.jsse.SSLContextParameters; import org.eclipse.jetty.jmx.MBeanContainer; @@ -60,23 +61,32 @@ public class WebsocketComponent extends UriEndpointComponent { protected static final Logger LOG = LoggerFactory.getLogger(WebsocketComponent.class); protected static final HashMap<String, ConnectorRef> CONNECTORS = new HashMap<String, ConnectorRef>(); - protected SSLContextParameters sslContextParameters; + protected Map<String, WebSocketFactory> socketFactory; + protected Server staticResourcesServer; protected MBeanContainer mbContainer; - protected ThreadPool threadPool; + @Metadata(label = "security") + protected SSLContextParameters sslContextParameters; + @Metadata(label = "advanced") + protected ThreadPool threadPool; + @Metadata(defaultValue = "9292") protected Integer port = 9292; + @Metadata(label = "advanced") protected Integer minThreads; + @Metadata(label = "advanced") protected Integer maxThreads; - + @Metadata(label = "advanced") protected boolean enableJmx; - + @Metadata(defaultValue = "0.0.0.0") protected String host = "0.0.0.0"; + @Metadata(label = "consumer") protected String staticResources; - protected Server staticResourcesServer; + @Metadata(label = "security", secret = true) protected String sslKeyPassword; + @Metadata(label = "security", secret = true) protected String sslPassword; + @Metadata(label = "security", secret = true) protected String sslKeystore; - protected Map<String, WebSocketFactory> socketFactory; /** * Map for storing servlets. {@link WebsocketComponentServlet} is identified by pathSpec {@link String}. http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java index 9b2928b..5cfbc06 100644 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java @@ -25,11 +25,14 @@ import org.apache.camel.Endpoint; import org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration; import org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; public class XmlSignatureComponent extends UriEndpointComponent { + @Metadata(label = "advanced") private XmlSignerConfiguration signerConfiguration; + @Metadata(label = "advanced") private XmlVerifierConfiguration verifierConfiguration; public XmlSignatureComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-yammer/src/main/docs/yammer-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-yammer/src/main/docs/yammer-component.adoc b/components/camel-yammer/src/main/docs/yammer-component.adoc index 6c5c210..5661768 100644 --- a/components/camel-yammer/src/main/docs/yammer-component.adoc +++ b/components/camel-yammer/src/main/docs/yammer-component.adoc @@ -82,9 +82,6 @@ The Yammer component supports 29 endpoint options which are listed below: |======================================================================= | Name | Group | Default | Java Type | Description | function | common | | YammerFunctionType | *Required* The function to use -| accessToken | common | | String | *Required* The access token -| consumerKey | common | | String | *Required* The consumer key -| consumerSecret | common | | String | *Required* The consumer secret | useJson | common | false | boolean | Set to true if you want to use raw JSON rather than converting to POJOs. | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored. | delay | consumer | 5000 | long | Delay between polling in millis @@ -110,6 +107,9 @@ The Yammer component supports 29 endpoint options which are listed below: | startScheduler | scheduler | true | boolean | Whether the scheduler should be auto started. | timeUnit | scheduler | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay options. | useFixedDelay | scheduler | true | boolean | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. +| accessToken | security | | String | *Required* The access token +| consumerKey | security | | String | *Required* The consumer key +| consumerSecret | security | | String | *Required* The consumer secret |======================================================================= {% endraw %} // endpoint options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java index 6d83570..e096f70 100644 --- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java +++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java @@ -20,15 +20,20 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.spi.Metadata; /** * Represents the component that manages {@link YammerEndpoint}. */ public class YammerComponent extends DefaultComponent { + @Metadata(label = "security", secret = true) private String consumerKey; + @Metadata(label = "security", secret = true) private String consumerSecret; + @Metadata(label = "security", secret = true) private String accessToken; + @Metadata(label = "advanced") private YammerConfiguration config; protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java index 9899d05..7db6208 100644 --- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java +++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java @@ -27,11 +27,11 @@ public class YammerConfiguration { @UriPath(name = "function") @Metadata(required = "true") private YammerFunctionType functionType; private String function; - @UriParam @Metadata(required = "true") + @UriParam(label = "security") @Metadata(required = "true", secret = true) private String consumerKey; - @UriParam @Metadata(required = "true") + @UriParam(label = "security") @Metadata(required = "true", secret = true) private String consumerSecret; - @UriParam @Metadata(required = "true") + @UriParam(label = "security") @Metadata(required = "true") private String accessToken; @UriParam private boolean useJson; http://git-wip-us.apache.org/repos/asf/camel/blob/1387f62e/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java index e104a9b..0a5e4ea 100644 --- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java +++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java @@ -24,12 +24,14 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelException; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; /** * Component that creates {@link ZooKeeperEndpoint}s for interacting with a ZooKeeper cluster. */ public class ZooKeeperComponent extends UriEndpointComponent { + @Metadata(label = "advanced") private ZooKeeperConfiguration configuration; public ZooKeeperComponent() {
