You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/12/14 17:58:20 UTC
[camel] branch master updated (682eca6 -> b3c6227)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 682eca6 CAMEL-15946: Fix javadoc build error about & sign
new f0d8755 CAMEL-15946: Fix javadoc build error about & sign
new 351569b CAMEL-15946: Fix endpoint dsl to output default value as valid javadoc
new a6ca90c CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped.
new 481b8c0 CAMEL-15946: Regen
new 04b01ca CAMEL-15945: Fixed compile error
new b3c6227 Regen
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/catalog/docs/minio-component.adoc | 2 +-
.../apache/camel/catalog/docs/sip-component.adoc | 2 +-
.../component/salesforce/SalesforceConsumer.java | 35 +++++++++--------
.../org/apache/camel/component/sip/sip.json | 2 +-
.../org/apache/camel/component/sip/sips.json | 2 +-
.../camel-sip/src/main/docs/sip-component.adoc | 2 +-
.../camel/component/sip/SipConfiguration.java | 2 +-
.../dsl/AtlasMapEndpointBuilderFactory.java | 10 ++---
.../dsl/DebeziumMongodbEndpointBuilderFactory.java | 4 +-
.../dsl/DebeziumMySqlEndpointBuilderFactory.java | 4 +-
.../DebeziumPostgresEndpointBuilderFactory.java | 4 +-
.../DebeziumSqlserverEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/KafkaEndpointBuilderFactory.java | 12 +++---
.../dsl/PlatformHttpEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/RestEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/SipEndpointBuilderFactory.java | 4 +-
.../dsl/StringTemplateEndpointBuilderFactory.java | 8 ++--
.../dsl/UndertowEndpointBuilderFactory.java | 4 +-
.../dsl/VertxKafkaEndpointBuilderFactory.java | 44 +++++++++++-----------
.../builder/endpoint/EndpointRouteBuilder.java | 2 +-
.../modules/ROOT/pages/minio-component.adoc | 2 +-
.../modules/ROOT/pages/sip-component.adoc | 2 +-
.../apache/camel/tooling/util/JavadocHelper.java | 19 ++++++++++
.../camel/maven/packaging/EndpointDslMojo.java | 8 +++-
.../ComponentDslBuilderFactoryGenerator.java | 3 ++
25 files changed, 107 insertions(+), 80 deletions(-)
[camel] 05/06: CAMEL-15945: Fixed compile error
Posted by da...@apache.org.
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
commit 04b01caad141065a5bf85a2546cad1282557d9dd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 14 18:55:19 2020 +0100
CAMEL-15945: Fixed compile error
---
.../component/salesforce/SalesforceConsumer.java | 35 +++++++++++-----------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index e054b6f..5299505 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -103,30 +103,29 @@ public class SalesforceConsumer extends DefaultConsumer {
rawPayload = endpoint.getConfiguration().isRawPayload();
- if (rawPayload) {
- return;
- }
-
// get sObjectClass to convert to
- final String sObjectName = endpoint.getConfiguration().getSObjectName();
- if (sObjectName != null) {
- sObjectClass = endpoint.getComponent().getClassMap().get(sObjectName);
- if (sObjectClass == null) {
- throw new IllegalArgumentException(String.format("SObject Class not found for %s", sObjectName));
- }
- } else {
- final String className = endpoint.getConfiguration().getSObjectClass();
- if (className != null) {
- sObjectClass = endpoint.getComponent().getCamelContext().getClassResolver().resolveClass(className);
+ if (!rawPayload) {
+ final String sObjectName = endpoint.getConfiguration().getSObjectName();
+ if (sObjectName != null) {
+ sObjectClass = endpoint.getComponent().getClassMap().get(sObjectName);
if (sObjectClass == null) {
- throw new IllegalArgumentException(String.format("SObject Class not found %s", className));
+ throw new IllegalArgumentException(String.format("SObject Class not found for %s", sObjectName));
}
} else {
- LOG.warn("Property sObjectName or sObjectClass NOT set, messages will be of type java.lang.Map");
- sObjectClass = null;
+ final String className = endpoint.getConfiguration().getSObjectClass();
+ if (className != null) {
+ sObjectClass = endpoint.getComponent().getCamelContext().getClassResolver().resolveClass(className);
+ if (sObjectClass == null) {
+ throw new IllegalArgumentException(String.format("SObject Class not found %s", className));
+ }
+ } else {
+ LOG.warn("Property sObjectName or sObjectClass NOT set, messages will be of type java.lang.Map");
+ sObjectClass = null;
+ }
}
+ } else {
+ sObjectClass = null;
}
-
}
public String getTopicName() {
[camel] 01/06: CAMEL-15946: Fix javadoc build error about & sign
Posted by da...@apache.org.
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
commit f0d8755bbe1c14aef99f77e65b5fd569867e7427
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 14 16:43:39 2020 +0100
CAMEL-15946: Fix javadoc build error about & sign
---
.../resources/org/apache/camel/catalog/docs/sip-component.adoc | 2 +-
.../src/generated/resources/org/apache/camel/component/sip/sip.json | 2 +-
.../src/generated/resources/org/apache/camel/component/sip/sips.json | 2 +-
components/camel-sip/src/main/docs/sip-component.adoc | 2 +-
.../main/java/org/apache/camel/component/sip/SipConfiguration.java | 2 +-
.../apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java | 4 ++--
.../java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java | 2 +-
docs/components/modules/ROOT/pages/sip-component.adoc | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
index 25f3268..74d6a5e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
@@ -136,7 +136,7 @@ with the following path and query parameters:
| *transport* (common) | Setting for choice of transport protocol. Valid choices are tcp or udp. There are 2 enums and the value can be one of: tcp, udp | tcp | String
| *bridgeErrorHandler* (consumer) | 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 or ERROR level and ignored. | false | boolean
| *consumer* (consumer) | This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created for this endpoint | false | boolean
-| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
+| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut | | ExchangePattern
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
diff --git a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
index 1f896cd..1a7a05e 100644
--- a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
+++ b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
@@ -46,7 +46,7 @@
"transport": { "kind": "parameter", "displayName": "Transport", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "tcp", "udp" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "tcp", "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "Setting for choice of transport protocol. Valid choices are tcp or udp." },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 m [...]
"consumer": { "kind": "parameter", "displayName": "Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created fo [...]
- "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that [...]
+ "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact th [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
diff --git a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sips.json b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sips.json
index baa114c..0aceb7c 100644
--- a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sips.json
+++ b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sips.json
@@ -46,7 +46,7 @@
"transport": { "kind": "parameter", "displayName": "Transport", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "tcp", "udp" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "tcp", "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "Setting for choice of transport protocol. Valid choices are tcp or udp." },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 m [...]
"consumer": { "kind": "parameter", "displayName": "Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created fo [...]
- "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that [...]
+ "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact th [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
diff --git a/components/camel-sip/src/main/docs/sip-component.adoc b/components/camel-sip/src/main/docs/sip-component.adoc
index 25f3268..74d6a5e 100644
--- a/components/camel-sip/src/main/docs/sip-component.adoc
+++ b/components/camel-sip/src/main/docs/sip-component.adoc
@@ -136,7 +136,7 @@ with the following path and query parameters:
| *transport* (common) | Setting for choice of transport protocol. Valid choices are tcp or udp. There are 2 enums and the value can be one of: tcp, udp | tcp | String
| *bridgeErrorHandler* (consumer) | 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 or ERROR level and ignored. | false | boolean
| *consumer* (consumer) | This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created for this endpoint | false | boolean
-| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
+| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut | | ExchangePattern
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
diff --git a/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java b/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
index 426a66d..59d8480 100644
--- a/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
+++ b/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
@@ -889,7 +889,7 @@ public class SipConfiguration {
}
/**
- * This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that the SIP
+ * This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact that the SIP
* Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to
* true.
*/
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java
index bd80aac..b886641 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java
@@ -361,7 +361,7 @@ public interface SipEndpointBuilderFactory {
return this;
}
/**
- * This setting is used to distinguish between a Presence Agent & a
+ * This setting is used to distinguish between a Presence Agent and a
* consumer. This is due to the fact that the SIP Camel component ships
* with a basic Presence Agent (for testing purposes only). Consumers
* have to set this flag to true.
@@ -376,7 +376,7 @@ public interface SipEndpointBuilderFactory {
return this;
}
/**
- * This setting is used to distinguish between a Presence Agent & a
+ * This setting is used to distinguish between a Presence Agent and a
* consumer. This is due to the fact that the SIP Camel component ships
* with a basic Presence Agent (for testing purposes only). Consumers
* have to set this flag to true.
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java
index 1449d95..b8f3434 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java
@@ -36,7 +36,7 @@ public abstract class EndpointRouteBuilder extends RouteBuilder implements Endpo
* Add routes to a context using a lambda expression. It can be used as following:
*
* <pre>
- * RouteBuilder.addRoutes(context, rb ->
+ * RouteBuilder.addRoutes(context, rb ->
* rb.from("direct:inbound").bean(ProduceTemplateBean.class)));
* </pre>
*
diff --git a/docs/components/modules/ROOT/pages/sip-component.adoc b/docs/components/modules/ROOT/pages/sip-component.adoc
index f241927..1180280 100644
--- a/docs/components/modules/ROOT/pages/sip-component.adoc
+++ b/docs/components/modules/ROOT/pages/sip-component.adoc
@@ -138,7 +138,7 @@ with the following path and query parameters:
| *transport* (common) | Setting for choice of transport protocol. Valid choices are tcp or udp. There are 2 enums and the value can be one of: tcp, udp | tcp | String
| *bridgeErrorHandler* (consumer) | 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 or ERROR level and ignored. | false | boolean
| *consumer* (consumer) | This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created for this endpoint | false | boolean
-| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
+| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut | | ExchangePattern
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
[camel] 06/06: Regen
Posted by da...@apache.org.
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
commit b3c62273fa540ab1001827155124dc8035492214
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 14 18:55:29 2020 +0100
Regen
---
.../resources/org/apache/camel/catalog/docs/minio-component.adoc | 2 +-
docs/components/modules/ROOT/pages/minio-component.adoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
index 69f089f..22c4f5b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
@@ -506,4 +506,4 @@ Maven users will need to add the following dependency to their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
+include::camel-spring-boot::page$minio-starter.adoc[]
diff --git a/docs/components/modules/ROOT/pages/minio-component.adoc b/docs/components/modules/ROOT/pages/minio-component.adoc
index 2109582..365473c 100644
--- a/docs/components/modules/ROOT/pages/minio-component.adoc
+++ b/docs/components/modules/ROOT/pages/minio-component.adoc
@@ -508,4 +508,4 @@ Maven users will need to add the following dependency to their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
+include::camel-spring-boot::page$minio-starter.adoc[]
[camel] 04/06: CAMEL-15946: Regen
Posted by da...@apache.org.
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
commit 481b8c0bfc0e33933f5ebc08af3618798d293e96
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 14 18:51:05 2020 +0100
CAMEL-15946: Regen
---
.../dsl/AtlasMapEndpointBuilderFactory.java | 10 ++---
.../dsl/DebeziumMongodbEndpointBuilderFactory.java | 4 +-
.../dsl/DebeziumMySqlEndpointBuilderFactory.java | 4 +-
.../DebeziumPostgresEndpointBuilderFactory.java | 4 +-
.../DebeziumSqlserverEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/KafkaEndpointBuilderFactory.java | 12 +++---
.../dsl/PlatformHttpEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/RestEndpointBuilderFactory.java | 2 +-
.../dsl/StringTemplateEndpointBuilderFactory.java | 8 ++--
.../dsl/UndertowEndpointBuilderFactory.java | 4 +-
.../dsl/VertxKafkaEndpointBuilderFactory.java | 44 +++++++++++-----------
11 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
index 8111255..4959f0e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
@@ -139,10 +139,10 @@ public interface AtlasMapEndpointBuilderFactory {
}
/**
* The Exchange property name for a source message map which hold
- * java.util.Map<String, Message> where the key is AtlasMap
- * Document ID. AtlasMap consumes Message bodies as source documents, as
- * well as message headers as source properties where the scope equals
- * to Document ID.
+ * java.util.Map&lt;String, Message&gt; where the key is
+ * AtlasMap Document ID. AtlasMap consumes Message bodies as source
+ * documents, as well as message headers as source properties where the
+ * scope equals to Document ID.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -191,7 +191,7 @@ public interface AtlasMapEndpointBuilderFactory {
}
/**
* The Exchange property name for a target document map which hold
- * java.util.Map<String, Object> where the key is AtlasMap
+ * java.util.Map&lt;String, Object&gt; where the key is AtlasMap
* Document ID. AtlasMap populates multiple target documents into this
* map.
*
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
index 3e68590..9a5abaf 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
@@ -48,7 +48,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -70,7 +70,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
index e242ce0..73b6987 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
@@ -48,7 +48,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -70,7 +70,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
index 1a389f4..c1f7ed1 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
@@ -48,7 +48,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -70,7 +70,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
index 8edc8bb..17d1fda 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
@@ -48,7 +48,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -70,7 +70,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
index b9843c4..38118b4 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
@@ -51,7 +51,7 @@ public interface KafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -73,7 +73,7 @@ public interface KafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -1484,7 +1484,7 @@ public interface KafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -1506,7 +1506,7 @@ public interface KafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -3085,7 +3085,7 @@ public interface KafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -3107,7 +3107,7 @@ public interface KafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PlatformHttpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PlatformHttpEndpointBuilderFactory.java
index 196b099..392c976 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PlatformHttpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PlatformHttpEndpointBuilderFactory.java
@@ -83,8 +83,8 @@ public interface PlatformHttpEndpointBuilderFactory {
}
/**
* The content type this endpoint accepts as an input, such as
- * application/xml or application/json. null or */* mean no
- * restriction.
+ * application/xml or application/json. null or &#42;/&#42; mean
+ * no restriction.
*
* The option is a: <code>java.lang.String</code> type.
*
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
index 7d3931b..ad8ffed 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
@@ -447,7 +447,7 @@ public interface RestEndpointBuilderFactory {
/**
* Query parameters for the HTTP service to call. The query parameters
* can contain multiple parameters separated by ampersand such such as
- * foo=123&bar=456.
+ * foo=123&bar=456.
*
* The option is a: <code>java.lang.String</code> type.
*
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
index e69db9a..3661843 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
@@ -136,7 +136,7 @@ public interface StringTemplateEndpointBuilderFactory {
*
* The option is a: <code>char</code> type.
*
- * Default: <
+ * Default: <
* Group: producer
*/
default StringTemplateEndpointBuilder delimiterStart(char delimiterStart) {
@@ -148,7 +148,7 @@ public interface StringTemplateEndpointBuilderFactory {
*
* The option will be converted to a <code>char</code> type.
*
- * Default: <
+ * Default: <
* Group: producer
*/
default StringTemplateEndpointBuilder delimiterStart(
@@ -161,7 +161,7 @@ public interface StringTemplateEndpointBuilderFactory {
*
* The option is a: <code>char</code> type.
*
- * Default: >
+ * Default: >
* Group: producer
*/
default StringTemplateEndpointBuilder delimiterStop(char delimiterStop) {
@@ -173,7 +173,7 @@ public interface StringTemplateEndpointBuilderFactory {
*
* The option will be converted to a <code>char</code> type.
*
- * Default: >
+ * Default: >
* Group: producer
*/
default StringTemplateEndpointBuilder delimiterStop(String delimiterStop) {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java
index 700635d..587d0fc 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java
@@ -738,7 +738,7 @@ public interface UndertowEndpointBuilderFactory {
* Sets additional channel options. The options that can be used are
* defined in org.xnio.Options. To configure from endpoint uri, then
* prefix each option with option., such as
- * option.close-abort=true&option.send-buffer=8192.
+ * option.close-abort=true&option.send-buffer=8192.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -756,7 +756,7 @@ public interface UndertowEndpointBuilderFactory {
* Sets additional channel options. The options that can be used are
* defined in org.xnio.Options. To configure from endpoint uri, then
* prefix each option with option., such as
- * option.close-abort=true&option.send-buffer=8192.
+ * option.close-abort=true&option.send-buffer=8192.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/VertxKafkaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/VertxKafkaEndpointBuilderFactory.java
index 53cedfd..a1e81b9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/VertxKafkaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/VertxKafkaEndpointBuilderFactory.java
@@ -50,7 +50,7 @@ public interface VertxKafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -72,7 +72,7 @@ public interface VertxKafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -91,8 +91,8 @@ public interface VertxKafkaEndpointBuilderFactory {
* A list of host/port pairs to use for establishing the initial
* connection to the Kafka cluster. The client will make use of all
* servers irrespective of which servers are specified here for
- * bootstrapping—this list only impacts the initial hosts used to
- * discover the full set of servers. This list should be in the form
+ * bootstrapping&mdash;this list only impacts the initial hosts used
+ * to discover the full set of servers. This list should be in the form
* host1:port1,host2:port2,.... Since these servers are just used for
* the initial connection to discover the full cluster membership (which
* may change dynamically), this list need not contain the full set of
@@ -1953,7 +1953,7 @@ public interface VertxKafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -1975,7 +1975,7 @@ public interface VertxKafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -1994,8 +1994,8 @@ public interface VertxKafkaEndpointBuilderFactory {
* A list of host/port pairs to use for establishing the initial
* connection to the Kafka cluster. The client will make use of all
* servers irrespective of which servers are specified here for
- * bootstrapping—this list only impacts the initial hosts used to
- * discover the full set of servers. This list should be in the form
+ * bootstrapping&mdash;this list only impacts the initial hosts used
+ * to discover the full set of servers. This list should be in the form
* host1:port1,host2:port2,.... Since these servers are just used for
* the initial connection to discover the full cluster membership (which
* may change dynamically), this list need not contain the full set of
@@ -2729,11 +2729,11 @@ public interface VertxKafkaEndpointBuilderFactory {
* sent out. However in some circumstances the client may want to reduce
* the number of requests even under moderate load. This setting
* accomplishes this by adding a small amount of artificial
- * delay—that is, rather than immediately sending out a record the
- * producer will wait for up to the given delay to allow other records
- * to be sent so that the sends can be batched together. This can be
- * thought of as analogous to Nagle's algorithm in TCP. This setting
- * gives the upper bound on the delay for batching: once we get
+ * delay&mdash;that is, rather than immediately sending out a record
+ * the producer will wait for up to the given delay to allow other
+ * records to be sent so that the sends can be batched together. This
+ * can be thought of as analogous to Nagle's algorithm in TCP. This
+ * setting gives the upper bound on the delay for batching: once we get
* batch.size worth of records for a partition it will be sent
* immediately regardless of this setting, however if we have fewer than
* this many bytes accumulated for this partition we will 'linger' for
@@ -2759,11 +2759,11 @@ public interface VertxKafkaEndpointBuilderFactory {
* sent out. However in some circumstances the client may want to reduce
* the number of requests even under moderate load. This setting
* accomplishes this by adding a small amount of artificial
- * delay—that is, rather than immediately sending out a record the
- * producer will wait for up to the given delay to allow other records
- * to be sent so that the sends can be batched together. This can be
- * thought of as analogous to Nagle's algorithm in TCP. This setting
- * gives the upper bound on the delay for batching: once we get
+ * delay&mdash;that is, rather than immediately sending out a record
+ * the producer will wait for up to the given delay to allow other
+ * records to be sent so that the sends can be batched together. This
+ * can be thought of as analogous to Nagle's algorithm in TCP. This
+ * setting gives the upper bound on the delay for batching: once we get
* batch.size worth of records for a partition it will be sent
* immediately regardless of this setting, however if we have fewer than
* this many bytes accumulated for this partition we will 'linger' for
@@ -3697,7 +3697,7 @@ public interface VertxKafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -3719,7 +3719,7 @@ public interface VertxKafkaEndpointBuilderFactory {
* configurations (e.g: new Kafka properties that are not reflected yet
* in Camel configurations), the properties have to be prefixed with
* additionalProperties.. E.g:
- * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+ * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: <code>java.util.Map<java.lang.String,
* java.lang.Object></code> type.
@@ -3737,8 +3737,8 @@ public interface VertxKafkaEndpointBuilderFactory {
* A list of host/port pairs to use for establishing the initial
* connection to the Kafka cluster. The client will make use of all
* servers irrespective of which servers are specified here for
- * bootstrapping—this list only impacts the initial hosts used to
- * discover the full set of servers. This list should be in the form
+ * bootstrapping&mdash;this list only impacts the initial hosts used
+ * to discover the full set of servers. This list should be in the form
* host1:port1,host2:port2,.... Since these servers are just used for
* the initial connection to discover the full cluster membership (which
* may change dynamically), this list need not contain the full set of
[camel] 03/06: CAMEL-15946: Fix endpoint and component dsl to
output source with valid javadoc that needs to be XML escaped.
Posted by da...@apache.org.
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
commit a6ca90cf168086f5beec8b8beae4bfe15d645b66
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 14 17:00:54 2020 +0100
CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped.
---
.../main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java | 3 +++
.../packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java | 3 +++
2 files changed, 6 insertions(+)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 512806c..1c62a07 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -448,6 +448,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
// basic description
String baseDesc = option.getDescription();
if (!Strings.isEmpty(baseDesc)) {
+ // must xml encode description as in some rare cases it contains & chars which is invalid javadoc
+ baseDesc = JavadocHelper.xmlEncode(baseDesc);
+
if (!baseDesc.endsWith(".")) {
baseDesc += ".";
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
index 2033648..6640ba1 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
@@ -23,6 +23,7 @@ import javax.annotation.Generated;
import org.apache.camel.maven.packaging.ComponentDslMojo;
import org.apache.camel.maven.packaging.dsl.DslHelper;
import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.util.JavadocHelper;
import org.apache.camel.tooling.util.srcgen.JavaClass;
import org.apache.camel.tooling.util.srcgen.Method;
@@ -111,6 +112,8 @@ public final class ComponentDslBuilderFactoryGenerator {
if (!componentModel.getDescription().isEmpty()) {
doc = componentModel.getDescription() + "\n\n" + doc;
}
+ // must xml encode description as in some rare cases it contains & chars which is invalid javadoc
+ doc = JavadocHelper.xmlEncode(doc);
javaClass.getJavaDoc().setText(doc);
}
[camel] 02/06: CAMEL-15946: Fix endpoint dsl to output default
value as valid javadoc
Posted by da...@apache.org.
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
commit 351569b4bf29fa819058709df59b967c31f561a7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 14 16:52:52 2020 +0100
CAMEL-15946: Fix endpoint dsl to output default value as valid javadoc
---
.../org/apache/camel/tooling/util/JavadocHelper.java | 19 +++++++++++++++++++
.../apache/camel/maven/packaging/EndpointDslMojo.java | 5 ++++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
index de0ac0c..9a89dcf 100644
--- a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
+++ b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
@@ -118,4 +118,23 @@ public final class JavadocHelper {
s = s.replaceAll("\\\\(http:|https:)", "$1");
return s.trim();
}
+
+ /**
+ * Encodes the text into safe XML by replacing < > and & with XML tokens
+ *
+ * @param text the text
+ * @return the encoded text
+ */
+ public static String xmlEncode(String text) {
+ if (text == null) {
+ return "";
+ }
+ // must replace amp first, so we dont replace < to amp later
+ text = text.replace("&", "&");
+ text = text.replace("\"", """);
+ text = text.replace("<", "<");
+ text = text.replace(">", ">");
+ return text;
+ }
+
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 8ea9846..512806c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -48,6 +48,7 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.ComponentModel.EndpointOptionModel;
import org.apache.camel.tooling.model.JsonMapper;
+import org.apache.camel.tooling.util.JavadocHelper;
import org.apache.camel.tooling.util.PackageHelper;
import org.apache.camel.tooling.util.Strings;
import org.apache.camel.tooling.util.srcgen.GenericType;
@@ -466,7 +467,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
}
// include default value (if any)
if (option.getDefaultValue() != null) {
- baseDesc += "\nDefault: " + option.getDefaultValue();
+ // must xml encode default value so its valid as javadoc
+ String value = JavadocHelper.xmlEncode(option.getDefaultValue().toString());
+ baseDesc += "\nDefault: " + value;
}
baseDesc += "\nGroup: " + option.getGroup();
}