[camel] branch master updated: CAMEL-14565: Add docs for missing option
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7d98feb CAMEL-14565: Add docs for missing option
7d98feb is described below
commit 7d98feb7ba038ed8206f3c9449cc793f6e106f84
Author: Claus Ibsen
AuthorDate: Mon Feb 17 10:52:09 2020 +0100
CAMEL-14565: Add docs for missing option
---
.../component/corda/CordaEndpointConfigurer.java | 13 +++
.../org/apache/camel/component/corda/corda.json| 7 ++
.../camel-corda/src/main/docs/corda-component.adoc | 24 --
.../camel/component/corda/CordaConfiguration.java | 96 +++---
.../camel/component/corda/CordaConsumer.java | 4 +-
.../camel/component/corda/CordaEndpoint.java | 7 +-
6 files changed, 87 insertions(+), 64 deletions(-)
diff --git
a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointConfigurer.java
b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointConfigurer.java
index 457f3cd..6aff744 100644
---
a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointConfigurer.java
+++
b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointConfigurer.java
@@ -17,10 +17,23 @@ public class CordaEndpointConfigurer extends
PropertyConfigurerSupport implement
switch (ignoreCase ? name.toLowerCase() : name) {
case "bridgeerrorhandler":
case "bridgeErrorHandler":
target.setBridgeErrorHandler(property(camelContext, boolean.class, value));
return true;
+case "pagespecification":
+case "pageSpecification":
target.getConfiguration().setPageSpecification(property(camelContext,
net.corda.core.node.services.vault.PageSpecification.class, value)); return
true;
+case "processsnapshot":
+case "processSnapshot":
target.getConfiguration().setProcessSnapshot(property(camelContext,
boolean.class, value)); return true;
+case "sort": target.getConfiguration().setSort(property(camelContext,
net.corda.core.node.services.vault.Sort.class, value)); return true;
+case "contractstateclass":
+case "contractStateClass":
target.getConfiguration().setContractStateClass(property(camelContext,
java.lang.Class.class, value)); return true;
case "exceptionhandler":
case "exceptionHandler":
target.setExceptionHandler(property(camelContext,
org.apache.camel.spi.ExceptionHandler.class, value)); return true;
case "exchangepattern":
case "exchangePattern":
target.setExchangePattern(property(camelContext,
org.apache.camel.ExchangePattern.class, value)); return true;
+case "flowlogicarguments":
+case "flowLogicArguments":
target.getConfiguration().setFlowLogicArguments(property(camelContext,
java.lang.Object[].class, value)); return true;
+case "flowlogicclass":
+case "flowLogicClass":
target.getConfiguration().setFlowLogicClass(property(camelContext,
java.lang.Class.class, value)); return true;
+case "querycriteria":
+case "queryCriteria":
target.getConfiguration().setQueryCriteria(property(camelContext,
net.corda.core.node.services.vault.QueryCriteria.class, value)); return true;
case "lazystartproducer":
case "lazyStartProducer":
target.setLazyStartProducer(property(camelContext, boolean.class, value));
return true;
case "operation":
target.getConfiguration().setOperation(property(camelContext,
java.lang.String.class, value)); return true;
diff --git
a/components/camel-corda/src/generated/resources/org/apache/camel/component/corda/corda.json
b/components/camel-corda/src/generated/resources/org/apache/camel/component/corda/corda.json
index ee55193..267882f 100644
---
a/components/camel-corda/src/generated/resources/org/apache/camel/component/corda/corda.json
+++
b/components/camel-corda/src/generated/resources/org/apache/camel/component/corda/corda.json
@@ -27,8 +27,15 @@
"properties": {
"node": { "kind": "path", "displayName": "Node", "group": "common",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "configurationClass":
"org.apache.camel.component.corda.CordaConfiguration", "configurationField":
"configuration", "description": "The url for the corda node" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "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
[camel] branch master updated: CAMEL-14565: Add docs for missing option
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1b68ff1 CAMEL-14565: Add docs for missing option
1b68ff1 is described below
commit 1b68ff1008a0b63aa3a1d41ae2da62f7bfd23181
Author: Claus Ibsen
AuthorDate: Sat Feb 15 14:32:30 2020 +0100
CAMEL-14565: Add docs for missing option
---
.../java/org/apache/camel/component/mail/MailConfiguration.java| 7 ---
.../java/org/apache/camel/component/mail/MailEndpointTest.java | 6 +++---
.../java/org/apache/camel/component/mail/MailEndpointTlsTest.java | 6 +++---
.../org/apache/camel/component/mail/MailUsingOwnComponentTest.java | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index f82864d..7637168 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -44,7 +44,8 @@ public class MailConfiguration implements Cloneable {
private transient Map recipients = new
HashMap<>();
// protocol is implied by component name so it should not be in UriPath
-private String protocol;
+private transient String protocol;
+
@UriPath @Metadata(required = true)
private String host;
@UriPath
@@ -147,7 +148,7 @@ public class MailConfiguration implements Cloneable {
if (!isIgnoreUriScheme()) {
String scheme = uri.getScheme();
if (scheme != null) {
-setProtocol(scheme);
+configureProtocol(scheme);
}
}
@@ -392,7 +393,7 @@ public class MailConfiguration implements Cloneable {
/**
* The protocol for communicating with the mail server
*/
-public void setProtocol(String protocol) {
+public void configureProtocol(String protocol) {
this.protocol = protocol;
}
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java
index 4b8beca..d721e3f 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java
@@ -31,7 +31,7 @@ public class MailEndpointTest extends CamelTestSupport {
MailConfiguration cfg = new MailConfiguration();
cfg.setPort(21);
-cfg.setProtocol("smtp");
+cfg.configureProtocol("smtp");
cfg.setHost("myhost");
cfg.setUsername("james");
cfg.setPassword("secret");
@@ -50,7 +50,7 @@ public class MailEndpointTest extends CamelTestSupport {
MailConfiguration cfg = new MailConfiguration();
cfg.setPort(21);
-cfg.setProtocol("smtp");
+cfg.configureProtocol("smtp");
cfg.setHost("myhost");
cfg.setUsername("james");
cfg.setPassword("secret");
@@ -63,7 +63,7 @@ public class MailEndpointTest extends CamelTestSupport {
public void testMailEndpointCtrEndpointConfig() throws Exception {
MailConfiguration cfg = new MailConfiguration();
cfg.setPort(21);
-cfg.setProtocol("smtp");
+cfg.configureProtocol("smtp");
cfg.setHost("myhost");
cfg.setUsername("james");
cfg.setPassword("secret");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java
index 25cee00..d54839b 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java
@@ -53,7 +53,7 @@ public class MailEndpointTlsTest extends CamelTestSupport {
MailConfiguration cfg = new MailConfiguration();
cfg.setPort(21);
-cfg.setProtocol(protocol);
+cfg.configureProtocol(protocol);
cfg.setHost("myhost");
cfg.setUsername("james");
cfg.setPassword("secret");
@@ -70,7 +70,7 @@ public class MailEndpointTlsTest extends CamelTestSupport {
public void testMailEndpointNoTlsConfig() throws Exception {
MailConfiguration cfg = new MailConfiguration();
cfg.setPort(21);
-cfg.setProtocol(protocol);
+cfg.configureProtocol(protocol);
cfg.setHost("myhost");
cfg.setUsername("james");
cfg.setPassword("secret");
@@ -100,7 +100,7 @@ public class MailEndpointTlsTest
[camel] branch master updated: CAMEL-14565: Add docs for missing option
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 83e9c07 CAMEL-14565: Add docs for missing option
83e9c07 is described below
commit 83e9c07804cdd920de81491948b42b71d0237540
Author: Claus Ibsen
AuthorDate: Fri Feb 14 16:18:11 2020 +0100
CAMEL-14565: Add docs for missing option
---
.../netty/http/NettyHttpSecurityConfiguration.java | 20 +---
.../camel/component/netty/NettyConfiguration.java| 16
.../component/netty/NettyManualEndpointTest.java | 2 +-
3 files changed, 14 insertions(+), 24 deletions(-)
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpSecurityConfiguration.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpSecurityConfiguration.java
index bec640e..9b4fe53 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpSecurityConfiguration.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpSecurityConfiguration.java
@@ -17,19 +17,26 @@
package org.apache.camel.component.netty.http;
import org.apache.camel.LoggingLevel;
+import org.apache.camel.spi.Metadata;
/**
* Security configuration for the {@link NettyHttpConsumer}.
*/
public class NettyHttpSecurityConfiguration {
+@Metadata(label = "security", defaultValue = "true", description =
"Whether to enable authentication")
private boolean authenticate = true;
+@Metadata(label = "security", defaultValue = "Basic", description =
"Security constraint. Currently only Basic is supported.")
private String constraint = "Basic";
+@Metadata(label = "security", description = "Name of security realm")
private String realm;
+@Metadata(label = "security", description = "Sets a SecurityConstraint to
use for checking if a web resource is restricted or not."
++ " By default this is null, which means all resources is
restricted.")
private SecurityConstraint securityConstraint;
+@Metadata(label = "security", description = " Sets the
SecurityAuthenticator to use for authenticating the HttpPrincipal.")
private SecurityAuthenticator securityAuthenticator;
+@Metadata(label = "security", defaultValue = "DEBUG", description = "Sets
a logging level to use for logging denied login attempts (incl stacktraces)")
private LoggingLevel loginDeniedLoggingLevel = LoggingLevel.DEBUG;
-private String roleClassName;
public boolean isAuthenticate() {
return authenticate;
@@ -37,8 +44,6 @@ public class NettyHttpSecurityConfiguration {
/**
* Whether to enable authentication
- *
- * This is by default enabled.
*/
public void setAuthenticate(boolean authenticate) {
this.authenticate = authenticate;
@@ -105,11 +110,4 @@ public class NettyHttpSecurityConfiguration {
this.loginDeniedLoggingLevel = loginDeniedLoggingLevel;
}
-public String getRoleClassName() {
-return roleClassName;
-}
-
-public void setRoleClassName(String roleClassName) {
-this.roleClassName = roleClassName;
-}
-}
+}
\ No newline at end of file
diff --git
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
index 37a9ba1..69f9222 100644
---
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
+++
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
@@ -375,27 +375,19 @@ public class NettyConfiguration extends
NettyServerBootstrapConfiguration implem
this.encoders = encoders;
}
-public ChannelHandler getEncoder() {
-return encoders.isEmpty() ? null : encoders.get(0);
-}
-
/**
- * A custom ChannelHandler class that can be used to perform special
marshalling of outbound payloads.
+ * Adds a custom ChannelHandler class that can be used to perform special
marshalling of outbound payloads.
*/
-public void setEncoder(ChannelHandler encoder) {
+public void addEncoder(ChannelHandler encoder) {
if (!encoders.contains(encoder)) {
encoders.add(encoder);
}
}
-public ChannelHandler getDecoder() {
-return decoders.isEmpty() ? null : decoders.get(0);
-}
-
/**
- * A custom ChannelHandler class that can be used to perform special
marshalling of inbound payloads.
+ * Adds a custom ChannelHandler class that can be used to perform special
marshalling of inbound payloads.
*/
-public void setDecoder(ChannelHandler decoder) {
+public void
[camel] branch master updated: CAMEL-14565: Add docs for missing option
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 24b1a3f CAMEL-14565: Add docs for missing option
24b1a3f is described below
commit 24b1a3fa0385da46988c27121fc63a33d02a4fa2
Author: Claus Ibsen
AuthorDate: Fri Feb 14 12:50:36 2020 +0100
CAMEL-14565: Add docs for missing option
---
.../java/org/apache/camel/component/jooq/JooqEndpointConfigurer.java | 2 ++
.../src/generated/resources/org/apache/camel/component/jooq/jooq.json | 1 +
components/camel-jooq/src/main/docs/jooq-component.adoc| 3 ++-
.../main/java/org/apache/camel/component/jooq/JooqConfiguration.java | 1 +
docs/components/modules/ROOT/pages/jooq-component.adoc | 3 ++-
5 files changed, 8 insertions(+), 2 deletions(-)
diff --git
a/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointConfigurer.java
b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointConfigurer.java
index 12e13e9..8b01c4d 100644
---
a/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointConfigurer.java
+++
b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointConfigurer.java
@@ -15,6 +15,8 @@ public class JooqEndpointConfigurer extends
PropertyConfigurerSupport implements
public boolean configure(CamelContext camelContext, Object obj, String
name, Object value, boolean ignoreCase) {
JooqEndpoint target = (JooqEndpoint) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
+case "databaseconfiguration":
+case "databaseConfiguration":
target.getConfiguration().setDatabaseConfiguration(property(camelContext,
org.jooq.Configuration.class, value)); return true;
case "bridgeerrorhandler":
case "bridgeErrorHandler":
target.setBridgeErrorHandler(property(camelContext, boolean.class, value));
return true;
case "consumedelete":
diff --git
a/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json
b/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json
index 12dbcac..6ef880f 100644
---
a/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json
+++
b/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json
@@ -26,6 +26,7 @@
},
"properties": {
"entityType": { "kind": "path", "displayName": "Entity Type", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.Class", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.jooq.JooqConfiguration",
"configurationField": "configuration", "description": "JOOQ entity class" },
+"databaseConfiguration": { "kind": "parameter", "displayName": "Database
Configuration", "group": "common", "label": "common", "required": false,
"type": "object", "javaType": "org.jooq.Configuration", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.jooq.JooqConfiguration", "configurationField":
"configuration", "description": "To use a specific database configuration" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "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 b [...]
"consumeDelete": { "kind": "parameter", "displayName": "Consume Delete",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.jooq.JooqConfiguration", "configurationField":
"configuration", "description": "Delete entity after it is consumed" },
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send
Empty Message When Idle", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret":
false, "defaultValue": false, "description": "If the polling consumer did not
poll any files, you can enable this option to send an empty message (no body)
instead." },
diff --git a/components/camel-jooq/src/main/docs/jooq-component.adoc
b/components/camel-jooq/src/main/docs/jooq-component.adoc
index 1e9b490..9f44bb8 100644
--- a/components/camel-jooq/src/main/docs/jooq-component.adoc
+++ b/components/camel-jooq/src/main/docs/jooq-component.adoc
