Repository: camel Updated Branches: refs/heads/master 47a50bcd2 -> 4977fbc03
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/4977fbc0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4977fbc0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4977fbc0 Branch: refs/heads/master Commit: 4977fbc0339b24b22aac978ebd4e50152819d814 Parents: 47a50bc Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Dec 21 15:58:44 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Dec 21 15:58:44 2016 +0100 ---------------------------------------------------------------------- .../component/restlet/RestletComponent.java | 21 +++++++++++++++++++- .../component/restlet/RestletEndpoint.java | 2 +- .../salesforce/SalesforceComponent.java | 16 +++++++++++++++ .../sap/netweaver/NetWeaverEndpoint.java | 4 ++-- .../camel/component/xquery/XQueryComponent.java | 2 ++ .../camel/component/xquery/XQueryEndpoint.java | 10 +++++----- .../servicenow/ServiceNowComponent.java | 7 +++++++ .../camel/component/sjms/SjmsComponent.java | 13 +++++++++++- .../sjms/batch/SjmsBatchComponent.java | 2 ++ .../camel/component/slack/SlackEndpoint.java | 2 +- .../camel/component/smpp/SmppComponent.java | 2 ++ .../component/sparkrest/SparkComponent.java | 12 +++++++++++ .../src/main/docs/splunk-component.adoc | 8 ++++---- .../camel/component/splunk/SplunkComponent.java | 2 ++ .../component/splunk/SplunkConfiguration.java | 8 ++++---- .../spring/batch/SpringBatchComponent.java | 3 ++- .../src/main/docs/spring-redis-component.adoc | 2 +- .../component/redis/RedisConfiguration.java | 2 +- .../src/main/docs/spring-ws-component.adoc | 2 +- .../ws/SpringWebserviceConfiguration.java | 4 ++-- .../camel/component/sql/SqlComponent.java | 3 ++- .../camel/component/ssh/SshComponent.java | 8 ++++++++ .../camel/component/ssh/SshConfiguration.java | 9 +++++---- .../camel/component/stomp/StompComponent.java | 20 +------------------ 24 files changed, 115 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java index fdbca18..0225e58 100644 --- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java +++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java @@ -35,6 +35,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.impl.HeaderFilterStrategyComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RestApiConsumerFactory; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spi.RestConsumerFactory; @@ -74,24 +75,43 @@ public class RestletComponent extends HeaderFilterStrategyComponent implements R private final Component component; // options that can be set on the restlet server + @Metadata(label = "consumer,advanced") private Boolean controllerDaemon; + @Metadata(label = "consumer,advanced") private Integer controllerSleepTimeMs; + @Metadata(label = "consumer") private Integer inboundBufferSize; + @Metadata(label = "consumer,advanced") private Integer minThreads; + @Metadata(label = "consumer,advanced") private Integer maxThreads; + @Metadata(label = "consumer,advanced") private Integer lowThreads; + @Metadata(label = "common") private Integer maxConnectionsPerHost; + @Metadata(label = "common") private Integer maxTotalConnections; + @Metadata(label = "consumer") private Integer outboundBufferSize; + @Metadata(label = "consumer,advanced") private Integer maxQueued; + @Metadata(label = "consumer,advanced") private Boolean persistingConnections; + @Metadata(label = "consumer,advanced") private Boolean pipeliningConnections; + @Metadata(label = "consumer,advanced") private Integer threadMaxIdleTimeMs; + @Metadata(label = "consumer") private Boolean useForwardedForHeader; + @Metadata(label = "consumer") private Boolean reuseAddress; + @Metadata(label = "consumer,advanced") private boolean disableStreamCache; + @Metadata(label = "consumer") private int port; + @Metadata(label = "producer") private Boolean synchronous; + @Metadata(label = "advanced") private List<String> enabledConverters; public RestletComponent() { @@ -676,7 +696,6 @@ public class RestletComponent extends HeaderFilterStrategyComponent implements R return enabledConverters; } - /** * 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 http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java index be23c6c..fa235f0 100644 --- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java +++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java @@ -77,7 +77,7 @@ public class RestletEndpoint extends DefaultEndpoint implements AsyncEndpoint, H private RestletBinding restletBinding; @UriParam(label = "producer", defaultValue = "true") private boolean throwExceptionOnFailure = true; - @UriParam(label = "advanced") + @UriParam(label = "consumer,advanced") private boolean disableStreamCache; @UriParam(label = "security") private SSLContextParameters sslContextParameters; http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java index 61357ea..7891841 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java @@ -39,6 +39,7 @@ import org.apache.camel.component.salesforce.internal.SalesforceSession; import org.apache.camel.component.salesforce.internal.streaming.SubscriptionHelper; import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.spi.EndpointCompleter; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.ReflectionHelper; @@ -66,28 +67,43 @@ public class SalesforceComponent extends UriEndpointComponent implements Endpoin private static final Pattern SOBJECT_NAME_PATTERN = Pattern.compile("^.*[\\?&]sObjectName=([^&,]+).*$"); private static final String APEX_CALL_PREFIX = OperationName.APEX_CALL.value() + "/"; + @Metadata(label = "security") private SalesforceLoginConfig loginConfig; + @Metadata(label = "advanced") private SalesforceEndpointConfig config; // HTTP client parameters, map of property-name to value + @Metadata(label = "advanced") private Map<String, Object> httpClientProperties; // SSL parameters + @Metadata(label = "security") private SSLContextParameters sslContextParameters; // Proxy host and port + @Metadata(label = "proxy") private String httpProxyHost; + @Metadata(label = "proxy") private Integer httpProxyPort; + @Metadata(label = "proxy") private boolean isHttpProxySocks4; + @Metadata(label = "proxy,security") private boolean isHttpProxySecure = true; + @Metadata(label = "proxy") private Set<String> httpProxyIncludedAddresses; + @Metadata(label = "proxy") private Set<String> httpProxyExcludedAddresses; // Proxy basic authentication + @Metadata(label = "proxy,security", secret = true) private String httpProxyUsername; + @Metadata(label = "proxy,security", secret = true) private String httpProxyPassword; + @Metadata(label = "proxy,security") private String httpProxyAuthUri; + @Metadata(label = "proxy,security") private String httpProxyRealm; + @Metadata(label = "proxy,security") private boolean httpProxyUseDigestAuth; // DTO packages to scan http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java index 28d476a..294f21f 100644 --- a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java +++ b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java @@ -40,9 +40,9 @@ public class NetWeaverEndpoint extends DefaultEndpoint { private boolean jsonAsMap = true; @UriParam(defaultValue = "true") private boolean flatternMap = true; - @UriParam @Metadata(required = "true") + @UriParam @Metadata(required = "true", secret = true) private String username; - @UriParam @Metadata(required = "true") + @UriParam @Metadata(required = "true", secret = true) private String password; public NetWeaverEndpoint(String endpointUri, Component component) { http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java index 0f3be86..01d8b4a 100644 --- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java +++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java @@ -22,6 +22,7 @@ import java.util.Map; import net.sf.saxon.lib.ModuleURIResolver; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ResourceHelper; /** @@ -30,6 +31,7 @@ import org.apache.camel.util.ResourceHelper; */ public class XQueryComponent extends UriEndpointComponent { + @Metadata(label = "advanced") private ModuleURIResolver moduleURIResolver = new XQueryModuleURIResolver(this); public XQueryComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java index 44a5eb3..41af952 100644 --- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java +++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java @@ -47,23 +47,23 @@ public class XQueryEndpoint extends ProcessorEndpoint { @UriPath @Metadata(required = "true") private String resourceUri; - @UriParam + @UriParam(label = "advanced") private Configuration configuration; - @UriParam + @UriParam(label = "advanced") private StaticQueryContext staticQueryContext; - @UriParam + @UriParam(label = "advanced") private Map<String, Object> parameters = new HashMap<String, Object>(); @UriParam private Map<String, String> namespacePrefixes = new HashMap<String, String>(); @UriParam(defaultValue = "DOM") private ResultFormat resultsFormat = ResultFormat.DOM; - @UriParam + @UriParam(label = "advanced") private Properties properties = new Properties(); @UriParam private Class<?> resultType; @UriParam(defaultValue = "true") private boolean stripsAllWhiteSpace = true; - @UriParam + @UriParam(label = "advanced") private ModuleURIResolver moduleURIResolver; @UriParam private boolean allowStAX; http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowComponent.java b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowComponent.java index 29b528a..ab3f7e0 100644 --- a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowComponent.java +++ b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowComponent.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.EndpointHelper; import org.apache.camel.util.IntrospectionSupport; @@ -29,6 +30,7 @@ import org.apache.camel.util.IntrospectionSupport; */ public class ServiceNowComponent extends UriEndpointComponent { + @Metadata(label = "advanced") private ServiceNowConfiguration configuration; public ServiceNowComponent() { @@ -105,6 +107,7 @@ public class ServiceNowComponent extends UriEndpointComponent { /** * ServiceNow user account name */ + @Metadata(label = "security", secret = true) public void setUserName(String userName) { configuration.setUserName(userName); } @@ -116,6 +119,7 @@ public class ServiceNowComponent extends UriEndpointComponent { /** * ServiceNow account password */ + @Metadata(label = "security", secret = true) public void setPassword(String password) { configuration.setPassword(password); } @@ -127,6 +131,7 @@ public class ServiceNowComponent extends UriEndpointComponent { /** * OAuth2 ClientID */ + @Metadata(label = "security", secret = true) public void setOauthClientId(String oauthClientId) { configuration.setOauthClientId(oauthClientId); } @@ -138,6 +143,7 @@ public class ServiceNowComponent extends UriEndpointComponent { /** * OAuth2 ClientSecret */ + @Metadata(label = "security", secret = true) public void setOauthClientSecret(String oauthClientSecret) { configuration.setOauthClientSecret(oauthClientSecret); } @@ -149,6 +155,7 @@ public class ServiceNowComponent extends UriEndpointComponent { /** * OAuth token Url */ + @Metadata(label = "security", secret = true) public void setOauthTokenUrl(String oauthTokenUrl) { configuration.setOauthTokenUrl(oauthTokenUrl); } http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java index 2294f55..97797c9 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java @@ -32,21 +32,32 @@ import org.apache.camel.component.sjms.taskmanager.TimedTaskManager; import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; +import org.apache.camel.spi.Metadata; /** * The <a href="http://camel.apache.org/sjms";>Simple JMS</a> component. */ public class SjmsComponent extends UriEndpointComponent implements HeaderFilterStrategyAware { + private ExecutorService asyncStartStopExecutorService; + + @Metadata(label = "advanced") private ConnectionFactory connectionFactory; + @Metadata(label = "advanced") private ConnectionResource connectionResource; + @Metadata(label = "advanced") private HeaderFilterStrategy headerFilterStrategy = new SjmsHeaderFilterStrategy(); + @Metadata(label = "advanced") private JmsKeyFormatStrategy jmsKeyFormatStrategy = new DefaultJmsKeyFormatStrategy(); + @Metadata(defaultValue = "1") private Integer connectionCount = 1; + @Metadata(label = "transaction") private TransactionCommitStrategy transactionCommitStrategy; + @Metadata(label = "advanced") private TimedTaskManager timedTaskManager; + @Metadata(label = "advanced") private DestinationCreationStrategy destinationCreationStrategy; - private ExecutorService asyncStartStopExecutorService; + @Metadata(label = "advanced") private MessageCreatedStrategy messageCreatedStrategy; public SjmsComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java index 4bca047..4403a68 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java @@ -21,10 +21,12 @@ import javax.jms.ConnectionFactory; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; public class SjmsBatchComponent extends UriEndpointComponent { + @Metadata(label = "advanced") private ConnectionFactory connectionFactory; public SjmsBatchComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java index 3011c4d..88ed4cd 100644 --- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java +++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java @@ -35,7 +35,7 @@ public class SlackEndpoint extends DefaultEndpoint { private String channel; @UriParam private String webhookUrl; - @UriParam + @UriParam(secret = true) private String username; @UriParam private String iconUrl; http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java index 6a8eb43..ae806c0 100644 --- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java +++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java @@ -22,12 +22,14 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; /** * @version */ public class SmppComponent extends UriEndpointComponent { + @Metadata(label = "advanced") private SmppConfiguration configuration; public SmppComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java index a8d0329..24efbb4 100644 --- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java +++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java @@ -26,6 +26,7 @@ import org.apache.camel.Consumer; import org.apache.camel.Endpoint; import org.apache.camel.Processor; 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; @@ -38,19 +39,30 @@ public class SparkComponent extends UriEndpointComponent implements RestConsumer private static final Pattern PATTERN = Pattern.compile("\\{(.*?)\\}"); + @Metadata(defaultValue = "4567") private int port = 4567; + @Metadata(defaultValue = "0.0.0.0") private String ipAddress; + @Metadata(label = "advanced") private int minThreads; + @Metadata(label = "advanced") private int maxThreads; + @Metadata(label = "advanced") private int timeOutMillis; + @Metadata(label = "security") private String keystoreFile; + @Metadata(label = "security", secret = true) private String keystorePassword; + @Metadata(label = "security") private String truststoreFile; + @Metadata(label = "security", secret = true) private String truststorePassword; + @Metadata(label = "advanced") private SparkConfiguration sparkConfiguration = new SparkConfiguration(); + @Metadata(label = "advanced") private SparkBinding sparkBinding = new DefaultSparkBinding(); public SparkComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-splunk/src/main/docs/splunk-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-splunk/src/main/docs/splunk-component.adoc b/components/camel-splunk/src/main/docs/splunk-component.adoc index 6066ddc..c62b790 100644 --- a/components/camel-splunk/src/main/docs/splunk-component.adoc +++ b/components/camel-splunk/src/main/docs/splunk-component.adoc @@ -124,12 +124,8 @@ The Splunk component supports 43 endpoint options which are listed below: | connectionTimeout | common | 5000 | int | Timeout in MS when connecting to Splunk server | host | common | localhost | String | Splunk host. | owner | common | | String | Splunk owner -| password | common | | String | Password for Splunk | port | common | 8089 | int | Splunk port | scheme | common | https | String | Splunk scheme -| sslProtocol | common | TLSv1.2 | SSLSecurityProtocol | Set the ssl protocol to use -| username | common | | String | Username for Splunk -| useSunHttpsHandler | common | false | boolean | Use sun.net.www.protocol.https.Handler Https handler to establish the Splunk Connection. Can be useful when running in application servers to avoid app. server https handling. | 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. | count | consumer | | int | A number that indicates the maximum number of entities to return. | earliestTime | consumer | | String | Earliest time of the search time window. @@ -162,6 +158,10 @@ The Splunk component supports 43 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. +| password | security | | String | Password for Splunk +| sslProtocol | security | TLSv1.2 | SSLSecurityProtocol | Set the ssl protocol to use +| username | security | | String | Username for Splunk +| useSunHttpsHandler | security | false | boolean | Use sun.net.www.protocol.https.Handler Https handler to establish the Splunk Connection. Can be useful when running in application servers to avoid app. server https handling. |======================================================================= {% endraw %} // endpoint options: END http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkComponent.java b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkComponent.java index 73a76d7..88f546f 100644 --- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkComponent.java +++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkComponent.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; /** * Represents the component that manages {@link SplunkEndpoint}. */ public class SplunkComponent extends UriEndpointComponent { + @Metadata(label = "advanced") private SplunkConfigurationFactory splunkConfigurationFactory = new DefaultSplunkConfigurationFactory(); public SplunkComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkConfiguration.java b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkConfiguration.java index 30d5efb..fc17970 100644 --- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkConfiguration.java +++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkConfiguration.java @@ -38,19 +38,19 @@ public class SplunkConfiguration { private String host = Service.DEFAULT_HOST; @UriParam(defaultValue = "8089") private int port = Service.DEFAULT_PORT; - @UriParam(enums = "TLSv1.2,TLSv1.1,TLSv1,SSLv3", defaultValue = "TLSv1.2") + @UriParam(enums = "TLSv1.2,TLSv1.1,TLSv1,SSLv3", defaultValue = "TLSv1.2", label = "security") private SSLSecurityProtocol sslProtocol = SSLSecurityProtocol.TLSv1_2; @UriParam private String app; @UriParam private String owner; - @UriParam + @UriParam(label = "security", secret = true) private String username; - @UriParam + @UriParam(label = "security", secret = true) private String password; @UriParam(defaultValue = "5000") private int connectionTimeout = 5000; - @UriParam + @UriParam(label = "security") private boolean useSunHttpsHandler; @UriParam(label = "producer") http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java index 4a11110..6805b29 100644 --- a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java +++ b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java @@ -27,9 +27,10 @@ public class SpringBatchComponent extends UriEndpointComponent { private static final String DEFAULT_JOB_LAUNCHER_REF_NAME = "jobLauncher"; - private JobLauncher jobLauncher; private JobLauncher defaultResolvedJobLauncher; private Map<String, JobLauncher> allResolvedJobLaunchers; + + private JobLauncher jobLauncher; private JobRegistry jobRegistry; public SpringBatchComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc b/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc index 96a9d7f..9b04033 100644 --- a/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc +++ b/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc @@ -52,12 +52,12 @@ The Spring Redis component supports 12 endpoint options which are listed below: | channels | common | | String | List of topic names or name patterns to subscribe to. Multiple names can be separated by comma. | command | common | SET | Command | Default command which can be overridden by message header. Notice the consumer only supports the following commands: PSUBSCRIBE and SUBSCRIBE | connectionFactory | common | | RedisConnectionFactory | Reference to a pre-configured RedisConnectionFactory instance to use. -| listenerContainer | common | | RedisMessageListenerContainer | Reference to a pre-configured RedisMessageListenerContainer instance to use. | redisTemplate | common | | RedisTemplate | Reference to a pre-configured RedisTemplate instance to use. | serializer | common | | RedisSerializer | Reference to a pre-configured RedisSerializer instance to use. | 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. | 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. +| listenerContainer | consumer (advanced) | | RedisMessageListenerContainer | Reference to a pre-configured RedisMessageListenerContainer instance to use. | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). |======================================================================= {% endraw %} http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java index 9369e33..3806d9f 100755 --- a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java +++ b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java @@ -42,7 +42,7 @@ public class RedisConfiguration { private String channels; @UriParam private RedisTemplate redisTemplate; - @UriParam + @UriParam(label = "consumer,advanced") private RedisMessageListenerContainer listenerContainer; @UriParam private RedisConnectionFactory connectionFactory; http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc b/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc index 4959c61..57a7ebc 100644 --- a/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc +++ b/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc @@ -107,7 +107,6 @@ The Spring WebService component supports 24 endpoint options which are listed be | endpointDispatcher | consumer | | CamelEndpointDispatcher | Spring org.springframework.ws.server.endpoint.MessageEndpoint for dispatching messages received by Spring-WS to a Camel endpoint to integrate with existing (legacy) endpoint mappings like PayloadRootQNameEndpointMapping SoapActionEndpointMapping etc. | endpointMapping | consumer | | CamelSpringWSEndpointMapping | Reference to an instance of org.apache.camel.component.spring.ws.bean.CamelEndpointMapping in the Registry/ApplicationContext. Only one bean is required in the registry to serve all Camel/Spring-WS endpoints. This bean is auto-discovered by the MessageDispatcher and used to map requests to Camel endpoints based on characteristics specified on the endpoint (like root QName SOAP action etc) | expression | consumer | | String | The XPath expression to use when option type=xpathresult. Then this option is required to be configured. -| sslContextParameters | consumer | | SSLContextParameters | To configure security using SSLContextParameters | 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. | allowResponseHeaderOverride | producer | false | boolean | Option to override soap response header in in/out exchange with header info from the actual service layer. If the invoked service appends or rewrites the soap header this option when set to true allows the modified soap header to be overwritten in in/out message headers @@ -123,6 +122,7 @@ The Spring WebService component supports 24 endpoint options which are listed be | webServiceTemplate | producer | | WebServiceTemplate | Option to provide a custom WebServiceTemplate. This allows for full control over client-side web services handling; like adding a custom interceptor or specifying a fault resolver message sender or message factory. | wsAddressingAction | producer | | URI | WS-Addressing 1.0 action header to include when accessing web services. The To header is set to the address of the web service as specified in the endpoint URI (default Spring-WS behavior). | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). +| sslContextParameters | security | | SSLContextParameters | To configure security using SSLContextParameters |======================================================================= {% endraw %} // endpoint options: END http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java index ae61fcc..af3942e 100644 --- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java +++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java @@ -46,6 +46,8 @@ public class SpringWebserviceConfiguration { /* Common configuration */ @UriParam private MessageFilter messageFilter; + @UriParam(label = "security") + private SSLContextParameters sslContextParameters; /* Producer configuration */ @UriParam(label = "producer") @@ -81,8 +83,6 @@ public class SpringWebserviceConfiguration { @UriParam(label = "consumer") private CamelEndpointDispatcher endpointDispatcher; @UriParam(label = "consumer") - private SSLContextParameters sslContextParameters; - @UriParam(label = "consumer") private String expression; public WebServiceTemplate getWebServiceTemplate() { http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java index 385d087..7284124 100755 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java @@ -33,8 +33,9 @@ import org.springframework.jdbc.core.JdbcTemplate; * @version */ public class SqlComponent extends UriEndpointComponent { + private DataSource dataSource; - @Metadata(defaultValue = "true") + @Metadata(label = "advanced", defaultValue = "true") private boolean usePlaceholder = true; public SqlComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java index 3f45770..3193f32 100644 --- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java +++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java @@ -21,12 +21,14 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.apache.sshd.common.KeyPairProvider; /** * Represents the component that manages {@link SshEndpoint}. */ public class SshComponent extends UriEndpointComponent { + @Metadata(label = "advanced") private SshConfiguration configuration; public SshComponent() { @@ -97,6 +99,7 @@ public class SshComponent extends UriEndpointComponent { * * @param username String representing login username. */ + @Metadata(label = "security", secret = true) public void setUsername(String username) { getConfiguration().setUsername(username); } @@ -111,6 +114,7 @@ public class SshComponent extends UriEndpointComponent { * * @param password String representing password for username at remote host. */ + @Metadata(label = "security", secret = true) public void setPassword(String password) { getConfiguration().setPassword(password); } @@ -142,6 +146,7 @@ public class SshComponent extends UriEndpointComponent { * * @see KeyPairProvider */ + @Metadata(label = "security") public void setKeyPairProvider(KeyPairProvider keyPairProvider) { getConfiguration().setKeyPairProvider(keyPairProvider); } @@ -158,6 +163,7 @@ public class SshComponent extends UriEndpointComponent { * * @see KeyPairProvider */ + @Metadata(label = "security") public void setKeyType(String keyType) { getConfiguration().setKeyType(keyType); } @@ -190,6 +196,7 @@ public class SshComponent extends UriEndpointComponent { * @deprecated As of version 2.11, replaced by {@link #setCertResource(String)} */ @Deprecated + @Metadata(label = "security") public void setCertFilename(String certFilename) { getConfiguration().setCertFilename(certFilename); } @@ -204,6 +211,7 @@ public class SshComponent extends UriEndpointComponent { * * @param certResource String file, classpath, or http url for the certificate */ + @Metadata(label = "security") public void setCertResource(String certResource) { getConfiguration().setCertResource(certResource); } http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java index c809988..c9a155e 100644 --- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java +++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java @@ -34,16 +34,17 @@ public class SshConfiguration implements Cloneable { private String host; @UriPath(defaultValue = "" + DEFAULT_SSH_PORT) private int port = DEFAULT_SSH_PORT; - @UriParam + @UriParam(label = "security", secret = true) private String username; - @UriParam + @UriParam(label = "security", secret = true) private String password; @UriParam(label = "consumer") private String pollCommand; + @UriParam(label = "security") private KeyPairProvider keyPairProvider; - @UriParam(defaultValue = KeyPairProvider.SSH_RSA) + @UriParam(label = "security", defaultValue = KeyPairProvider.SSH_RSA) private String keyType = KeyPairProvider.SSH_RSA; - @UriParam + @UriParam(label = "security") private String certResource; @UriParam(defaultValue = "30000") private long timeout = 30000; http://git-wip-us.apache.org/repos/asf/camel/blob/4977fbc0/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java index 3684345..eeb1b6a 100644 --- a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java +++ b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java @@ -24,31 +24,13 @@ import org.apache.camel.spi.Metadata; public class StompComponent extends UriEndpointComponent { - /** - * To use the shared stomp configuration - */ + @Metadata(label = "advanced") private StompConfiguration configuration = new StompConfiguration(); - - /** - * The URI of the Stomp broker to connect to - */ private String brokerUrl; - - /** - * The username - */ @Metadata(label = "security", secret = true) private String login; - - /** - * The password - */ @Metadata(label = "security", secret = true) private String passcode; - - /** - * The virtual host - */ private String host; public StompComponent() {
