This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 3.11.0 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 756d31340692cff3e5f9595268f664bbf5de4a72 Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Jul 22 09:15:02 2021 +0200 Upgrade Camel to version 3.11.0: Regen --- .../src/generated/resources/connectors/camel-aws2-sqs-sink.json | 2 +- .../generated/resources/connectors/camel-aws2-sqs-source.json | 2 +- .../resources/connectors/camel-elasticsearch-rest-sink.json | 2 +- .../src/generated/resources/connectors/camel-log-sink.json | 9 +-------- .../src/generated/resources/connectors/camel-netty-sink.json | 2 +- .../src/generated/resources/connectors/camel-netty-source.json | 2 +- .../src/generated/resources/connectors/camel-quartz-source.json | 2 +- .../src/generated/resources/camel-aws2-sqs-sink.json | 2 +- .../src/generated/resources/camel-aws2-sqs-source.json | 2 +- .../src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc | 2 +- .../src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc | 2 +- .../src/generated/resources/camel-elasticsearch-rest-sink.json | 2 +- .../main/docs/camel-elasticsearch-rest-kafka-sink-connector.adoc | 2 +- .../src/generated/resources/camel-log-sink.json | 9 +-------- .../src/main/docs/camel-log-kafka-sink-connector.adoc | 5 ++--- .../camel/kafkaconnector/log/CamelLogSinkConnectorConfig.java | 6 +----- .../src/generated/resources/camel-netty-sink.json | 2 +- .../src/generated/resources/camel-netty-source.json | 2 +- .../src/main/docs/camel-netty-kafka-sink-connector.adoc | 2 +- .../src/main/docs/camel-netty-kafka-source-connector.adoc | 2 +- .../src/generated/resources/camel-quartz-source.json | 2 +- .../src/main/docs/camel-quartz-kafka-source-connector.adoc | 2 +- .../kafkaconnector/quartz/CamelQuartzSourceConnectorConfig.java | 2 +- .../pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc | 2 +- .../pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc | 2 +- .../camel-elasticsearch-rest-kafka-sink-connector.adoc | 2 +- .../ROOT/pages/connectors/camel-log-kafka-sink-connector.adoc | 5 ++--- .../ROOT/pages/connectors/camel-netty-kafka-sink-connector.adoc | 2 +- .../pages/connectors/camel-netty-kafka-source-connector.adoc | 2 +- .../pages/connectors/camel-quartz-kafka-source-connector.adoc | 2 +- 30 files changed, 32 insertions(+), 52 deletions(-) diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json index 247d472..b1f8cd5 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json @@ -6,7 +6,7 @@ "id": "camel-aws2-sqs-sink", "type": "sink", "version": "0.11.0-SNAPSHOT", - "description": "Send and receive messages to\/from AWS SQS service using AWS SDK version 2.x." + "description": "Sending and receive messages to\/from AWS SQS service using AWS SDK version 2.x." }, "properties": { "camel.sink.path.queueNameOrArn": { diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json index 0d8dfc8..7df6b25 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json @@ -6,7 +6,7 @@ "id": "camel-aws2-sqs-source", "type": "source", "version": "0.11.0-SNAPSHOT", - "description": "Send and receive messages to\/from AWS SQS service using AWS SDK version 2.x." + "description": "Sending and receive messages to\/from AWS SQS service using AWS SDK version 2.x." }, "properties": { "camel.source.path.queueNameOrArn": { diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json index 3112a18..019f751 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json @@ -6,7 +6,7 @@ "id": "camel-elasticsearch-rest-sink", "type": "sink", "version": "0.11.0-SNAPSHOT", - "description": "Send requests to ElasticSearch via REST API" + "description": "Send requests to with an ElasticSearch via REST API." }, "properties": { "camel.sink.path.clusterName": { diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json index 6e58ed9..19504d3 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json @@ -101,13 +101,6 @@ "priority": "MEDIUM", "required": "false" }, - "camel.sink.endpoint.showAllProperties": { - "name": "camel.sink.endpoint.showAllProperties", - "description": "Show all of the exchange properties (both internal and custom).", - "defaultValue": "false", - "priority": "MEDIUM", - "required": "false" - }, "camel.sink.endpoint.showBody": { "name": "camel.sink.endpoint.showBody", "description": "Show the message body.", @@ -173,7 +166,7 @@ }, "camel.sink.endpoint.showProperties": { "name": "camel.sink.endpoint.showProperties", - "description": "Show the exchange properties (only custom). Use showAllProperties to show both internal and custom properties.", + "description": "Show the exchange properties.", "defaultValue": "false", "priority": "MEDIUM", "required": "false" diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json index 0c974fd..5f33693 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json @@ -6,7 +6,7 @@ "id": "camel-netty-sink", "type": "sink", "version": "0.11.0-SNAPSHOT", - "description": "Socket level networking using TCP or UDP with Netty 4.x." + "description": "Socket level networking using TCP or UDP with the Netty 4.x." }, "properties": { "camel.sink.path.protocol": { diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json index 246e532..89a47c7 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json @@ -6,7 +6,7 @@ "id": "camel-netty-source", "type": "source", "version": "0.11.0-SNAPSHOT", - "description": "Socket level networking using TCP or UDP with Netty 4.x." + "description": "Socket level networking using TCP or UDP with the Netty 4.x." }, "properties": { "camel.source.path.protocol": { diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json index 632b3f6..9f2fa5f 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json @@ -220,7 +220,7 @@ }, "camel.component.quartz.interruptJobsOnShutdown": { "name": "camel.component.quartz.interruptJobsOnShutdown", - "description": "Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted. When a job is interrupted then Camel will mark the exchange to stop continue routing and set java.util.concurrent.RejectedExecutionException as caused exception. Therefore use this with care, as its often better to allow Camel jobs to complete and shutdown gracefully.", + "description": "Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted.", "defaultValue": "false", "priority": "MEDIUM", "required": "false" diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json index 247d472..b1f8cd5 100644 --- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json +++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json @@ -6,7 +6,7 @@ "id": "camel-aws2-sqs-sink", "type": "sink", "version": "0.11.0-SNAPSHOT", - "description": "Send and receive messages to\/from AWS SQS service using AWS SDK version 2.x." + "description": "Sending and receive messages to\/from AWS SQS service using AWS SDK version 2.x." }, "properties": { "camel.sink.path.queueNameOrArn": { diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json index 0d8dfc8..7df6b25 100644 --- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json +++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json @@ -6,7 +6,7 @@ "id": "camel-aws2-sqs-source", "type": "source", "version": "0.11.0-SNAPSHOT", - "description": "Send and receive messages to\/from AWS SQS service using AWS SDK version 2.x." + "description": "Sending and receive messages to\/from AWS SQS service using AWS SDK version 2.x." }, "properties": { "camel.source.path.queueNameOrArn": { diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc index 52ecbb1..80d7a6f 100644 --- a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc +++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc @@ -2,7 +2,7 @@ [[camel-aws2-sqs-kafka-connector-sink]] = camel-aws2-sqs-kafka-connector sink configuration -Connector Description: Send and receive messages to/from AWS SQS service using AWS SDK version 2.x. +Connector Description: Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x. When using camel-aws2-sqs-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector: diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc index 32c4bc8..1f125b6 100644 --- a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc +++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc @@ -2,7 +2,7 @@ [[camel-aws2-sqs-kafka-connector-source]] = camel-aws2-sqs-kafka-connector source configuration -Connector description: Send and receive messages to/from AWS SQS service using AWS SDK version 2.x. +Connector description: Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x. When using camel-aws2-sqs-kafka-connector as source make sure to use the following Maven dependency to have support for the connector: diff --git a/connectors/camel-elasticsearch-rest-kafka-connector/src/generated/resources/camel-elasticsearch-rest-sink.json b/connectors/camel-elasticsearch-rest-kafka-connector/src/generated/resources/camel-elasticsearch-rest-sink.json index 3112a18..019f751 100644 --- a/connectors/camel-elasticsearch-rest-kafka-connector/src/generated/resources/camel-elasticsearch-rest-sink.json +++ b/connectors/camel-elasticsearch-rest-kafka-connector/src/generated/resources/camel-elasticsearch-rest-sink.json @@ -6,7 +6,7 @@ "id": "camel-elasticsearch-rest-sink", "type": "sink", "version": "0.11.0-SNAPSHOT", - "description": "Send requests to ElasticSearch via REST API" + "description": "Send requests to with an ElasticSearch via REST API." }, "properties": { "camel.sink.path.clusterName": { diff --git a/connectors/camel-elasticsearch-rest-kafka-connector/src/main/docs/camel-elasticsearch-rest-kafka-sink-connector.adoc b/connectors/camel-elasticsearch-rest-kafka-connector/src/main/docs/camel-elasticsearch-rest-kafka-sink-connector.adoc index c9e5dd8..b90c5a1 100644 --- a/connectors/camel-elasticsearch-rest-kafka-connector/src/main/docs/camel-elasticsearch-rest-kafka-sink-connector.adoc +++ b/connectors/camel-elasticsearch-rest-kafka-connector/src/main/docs/camel-elasticsearch-rest-kafka-sink-connector.adoc @@ -2,7 +2,7 @@ [[camel-elasticsearch-rest-kafka-connector-sink]] = camel-elasticsearch-rest-kafka-connector sink configuration -Connector Description: Send requests to ElasticSearch via REST API +Connector Description: Send requests to with an ElasticSearch via REST API. When using camel-elasticsearch-rest-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector: diff --git a/connectors/camel-log-kafka-connector/src/generated/resources/camel-log-sink.json b/connectors/camel-log-kafka-connector/src/generated/resources/camel-log-sink.json index 6e58ed9..19504d3 100644 --- a/connectors/camel-log-kafka-connector/src/generated/resources/camel-log-sink.json +++ b/connectors/camel-log-kafka-connector/src/generated/resources/camel-log-sink.json @@ -101,13 +101,6 @@ "priority": "MEDIUM", "required": "false" }, - "camel.sink.endpoint.showAllProperties": { - "name": "camel.sink.endpoint.showAllProperties", - "description": "Show all of the exchange properties (both internal and custom).", - "defaultValue": "false", - "priority": "MEDIUM", - "required": "false" - }, "camel.sink.endpoint.showBody": { "name": "camel.sink.endpoint.showBody", "description": "Show the message body.", @@ -173,7 +166,7 @@ }, "camel.sink.endpoint.showProperties": { "name": "camel.sink.endpoint.showProperties", - "description": "Show the exchange properties (only custom). Use showAllProperties to show both internal and custom properties.", + "description": "Show the exchange properties.", "defaultValue": "false", "priority": "MEDIUM", "required": "false" diff --git a/connectors/camel-log-kafka-connector/src/main/docs/camel-log-kafka-sink-connector.adoc b/connectors/camel-log-kafka-connector/src/main/docs/camel-log-kafka-sink-connector.adoc index b128be8..fae5692 100644 --- a/connectors/camel-log-kafka-connector/src/main/docs/camel-log-kafka-sink-connector.adoc +++ b/connectors/camel-log-kafka-connector/src/main/docs/camel-log-kafka-sink-connector.adoc @@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.log.CamelLogSinkConnector ---- -The camel-log sink connector supports 31 options, which are listed below. +The camel-log sink connector supports 30 options, which are listed below. @@ -44,7 +44,6 @@ The camel-log sink connector supports 31 options, which are listed below. | *camel.sink.endpoint.maxChars* | Limits the number of characters logged per line. | 10000 | false | MEDIUM | *camel.sink.endpoint.multiline* | If enabled then each information is outputted on a newline. | false | false | MEDIUM | *camel.sink.endpoint.showAll* | Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used) | false | false | MEDIUM -| *camel.sink.endpoint.showAllProperties* | Show all of the exchange properties (both internal and custom). | false | false | MEDIUM | *camel.sink.endpoint.showBody* | Show the message body. | true | false | MEDIUM | *camel.sink.endpoint.showBodyType* | Show the body Java type. | true | false | MEDIUM | *camel.sink.endpoint.showCaughtException* | If the exchange has a caught exception, show the exception message (no stack trace). A caught exception is stored as a property on the exchange (using the key org.apache.camel.Exchange#EXCEPTION_CAUGHT) and for instance a doCatch can catch exceptions. | false | false | MEDIUM @@ -54,7 +53,7 @@ The camel-log sink connector supports 31 options, which are listed below. | *camel.sink.endpoint.showFiles* | If enabled Camel will output files | false | false | MEDIUM | *camel.sink.endpoint.showFuture* | If enabled Camel will on Future objects wait for it to complete to obtain the payload to be logged. | false | false | MEDIUM | *camel.sink.endpoint.showHeaders* | Show the message headers. | false | false | MEDIUM -| *camel.sink.endpoint.showProperties* | Show the exchange properties (only custom). Use showAllProperties to show both internal and custom properties. | false | false | MEDIUM +| *camel.sink.endpoint.showProperties* | Show the exchange properties. | false | false | MEDIUM | *camel.sink.endpoint.showStackTrace* | Show the stack trace, if an exchange has an exception. Only effective if one of showAll, showException or showCaughtException are enabled. | false | false | MEDIUM | *camel.sink.endpoint.showStreams* | Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use Stream Caching. | false | false | MEDIUM | *camel.sink.endpoint.skipBodyLineSeparator* | Whether to skip line separators when logging the message body. This allows to log the message body in one line, setting this option to false will preserve any line separators from the body, which then will log the body as is. | true | false | MEDIUM diff --git a/connectors/camel-log-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/log/CamelLogSinkConnectorConfig.java b/connectors/camel-log-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/log/CamelLogSinkConnectorConfig.java index 4ceb345..9b16ab7 100644 --- a/connectors/camel-log-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/log/CamelLogSinkConnectorConfig.java +++ b/connectors/camel-log-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/log/CamelLogSinkConnectorConfig.java @@ -63,9 +63,6 @@ public class CamelLogSinkConnectorConfig extends CamelSinkConnectorConfig { public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_CONF = "camel.sink.endpoint.showAll"; public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_DOC = "Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used)"; public static final Boolean CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_DEFAULT = false; - public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_PROPERTIES_CONF = "camel.sink.endpoint.showAllProperties"; - public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_PROPERTIES_DOC = "Show all of the exchange properties (both internal and custom)."; - public static final Boolean CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_PROPERTIES_DEFAULT = false; public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_BODY_CONF = "camel.sink.endpoint.showBody"; public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_BODY_DOC = "Show the message body."; public static final Boolean CAMEL_SINK_LOG_ENDPOINT_SHOW_BODY_DEFAULT = true; @@ -94,7 +91,7 @@ public class CamelLogSinkConnectorConfig extends CamelSinkConnectorConfig { public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_HEADERS_DOC = "Show the message headers."; public static final Boolean CAMEL_SINK_LOG_ENDPOINT_SHOW_HEADERS_DEFAULT = false; public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_PROPERTIES_CONF = "camel.sink.endpoint.showProperties"; - public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_PROPERTIES_DOC = "Show the exchange properties (only custom). Use showAllProperties to show both internal and custom properties."; + public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_PROPERTIES_DOC = "Show the exchange properties."; public static final Boolean CAMEL_SINK_LOG_ENDPOINT_SHOW_PROPERTIES_DEFAULT = false; public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_STACK_TRACE_CONF = "camel.sink.endpoint.showStackTrace"; public static final String CAMEL_SINK_LOG_ENDPOINT_SHOW_STACK_TRACE_DOC = "Show the stack trace, if an exchange has an exception. Only effective if one of showAll, showException or showCaughtException are enabled."; @@ -143,7 +140,6 @@ public class CamelLogSinkConnectorConfig extends CamelSinkConnectorConfig { conf.define(CAMEL_SINK_LOG_ENDPOINT_MAX_CHARS_CONF, ConfigDef.Type.INT, CAMEL_SINK_LOG_ENDPOINT_MAX_CHARS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_LOG_ENDPOINT_MAX_CHARS_DOC); conf.define(CAMEL_SINK_LOG_ENDPOINT_MULTILINE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_LOG_ENDPOINT_MULTILINE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_LOG_ENDPOINT_MULTILINE_DOC); conf.define(CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_DOC); - conf.define(CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_PROPERTIES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_PROPERTIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_LOG_ENDPOINT_SHOW_ALL_PROPERTIES_DOC); conf.define(CAMEL_SINK_LOG_ENDPOINT_SHOW_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_LOG_ENDPOINT_SHOW_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_LOG_ENDPOINT_SHOW_BODY_DOC); conf.define(CAMEL_SINK_LOG_ENDPOINT_SHOW_BODY_TYPE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_LOG_ENDPOINT_SHOW_BODY_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_LOG_ENDPOINT_SHOW_BODY_TYPE_DOC); conf.define(CAMEL_SINK_LOG_ENDPOINT_SHOW_CAUGHT_EXCEPTION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_LOG_ENDPOINT_SHOW_CAUGHT_EXCEPTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_LOG_ENDPOINT_SHOW_CAUGHT_EXCEPTION_DOC); diff --git a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json index 0c974fd..5f33693 100644 --- a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json +++ b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json @@ -6,7 +6,7 @@ "id": "camel-netty-sink", "type": "sink", "version": "0.11.0-SNAPSHOT", - "description": "Socket level networking using TCP or UDP with Netty 4.x." + "description": "Socket level networking using TCP or UDP with the Netty 4.x." }, "properties": { "camel.sink.path.protocol": { diff --git a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-source.json b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-source.json index 246e532..89a47c7 100644 --- a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-source.json +++ b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-source.json @@ -6,7 +6,7 @@ "id": "camel-netty-source", "type": "source", "version": "0.11.0-SNAPSHOT", - "description": "Socket level networking using TCP or UDP with Netty 4.x." + "description": "Socket level networking using TCP or UDP with the Netty 4.x." }, "properties": { "camel.source.path.protocol": { diff --git a/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-sink-connector.adoc b/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-sink-connector.adoc index dd4ef1e..3cd0dc3 100644 --- a/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-sink-connector.adoc +++ b/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-sink-connector.adoc @@ -2,7 +2,7 @@ [[camel-netty-kafka-connector-sink]] = camel-netty-kafka-connector sink configuration -Connector Description: Socket level networking using TCP or UDP with Netty 4.x. +Connector Description: Socket level networking using TCP or UDP with the Netty 4.x. When using camel-netty-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector: diff --git a/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-source-connector.adoc b/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-source-connector.adoc index 467085d..07a8199 100644 --- a/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-source-connector.adoc +++ b/connectors/camel-netty-kafka-connector/src/main/docs/camel-netty-kafka-source-connector.adoc @@ -2,7 +2,7 @@ [[camel-netty-kafka-connector-source]] = camel-netty-kafka-connector source configuration -Connector description: Socket level networking using TCP or UDP with Netty 4.x. +Connector description: Socket level networking using TCP or UDP with the Netty 4.x. When using camel-netty-kafka-connector as source make sure to use the following Maven dependency to have support for the connector: diff --git a/connectors/camel-quartz-kafka-connector/src/generated/resources/camel-quartz-source.json b/connectors/camel-quartz-kafka-connector/src/generated/resources/camel-quartz-source.json index 632b3f6..9f2fa5f 100644 --- a/connectors/camel-quartz-kafka-connector/src/generated/resources/camel-quartz-source.json +++ b/connectors/camel-quartz-kafka-connector/src/generated/resources/camel-quartz-source.json @@ -220,7 +220,7 @@ }, "camel.component.quartz.interruptJobsOnShutdown": { "name": "camel.component.quartz.interruptJobsOnShutdown", - "description": "Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted. When a job is interrupted then Camel will mark the exchange to stop continue routing and set java.util.concurrent.RejectedExecutionException as caused exception. Therefore use this with care, as its often better to allow Camel jobs to complete and shutdown gracefully.", + "description": "Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted.", "defaultValue": "false", "priority": "MEDIUM", "required": "false" diff --git a/connectors/camel-quartz-kafka-connector/src/main/docs/camel-quartz-kafka-source-connector.adoc b/connectors/camel-quartz-kafka-connector/src/main/docs/camel-quartz-kafka-source-connector.adoc index 7fed5df..d2a3c44 100644 --- a/connectors/camel-quartz-kafka-connector/src/main/docs/camel-quartz-kafka-source-connector.adoc +++ b/connectors/camel-quartz-kafka-connector/src/main/docs/camel-quartz-kafka-source-connector.adoc @@ -62,7 +62,7 @@ The camel-quartz source connector supports 33 options, which are listed below. | *camel.component.quartz.scheduler* | To use the custom configured Quartz scheduler, instead of creating a new Scheduler. | null | false | MEDIUM | *camel.component.quartz.schedulerFactory* | To use the custom SchedulerFactory which is used to create the Scheduler. | null | false | MEDIUM | *camel.component.quartz.autoStartScheduler* | Whether or not the scheduler should be auto started. This options is default true | true | false | MEDIUM -| *camel.component.quartz.interruptJobsOnShutdown* | Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted. When a job is interrupted then Camel will mark the exchange to stop continue routing and set java.util.concurrent.RejectedExecutionException as caused exception. Therefore use this with care, as its often better to allow Camel jobs to [...] +| *camel.component.quartz.interruptJobsOnShutdown* | Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted. | false | false | MEDIUM | *camel.component.quartz.startDelayedSeconds* | Seconds to wait before starting the quartz scheduler. | null | false | MEDIUM |=== diff --git a/connectors/camel-quartz-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/quartz/CamelQuartzSourceConnectorConfig.java b/connectors/camel-quartz-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/quartz/CamelQuartzSourceConnectorConfig.java index 5b0b183..d6cc32e 100644 --- a/connectors/camel-quartz-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/quartz/CamelQuartzSourceConnectorConfig.java +++ b/connectors/camel-quartz-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/quartz/CamelQuartzSourceConnectorConfig.java @@ -120,7 +120,7 @@ public class CamelQuartzSourceConnectorConfig public static final String CAMEL_SOURCE_QUARTZ_COMPONENT_AUTO_START_SCHEDULER_DOC = "Whether or not the scheduler should be auto started. This options is default true"; public static final Boolean CAMEL_SOURCE_QUARTZ_COMPONENT_AUTO_START_SCHEDULER_DEFAULT = true; public static final String CAMEL_SOURCE_QUARTZ_COMPONENT_INTERRUPT_JOBS_ON_SHUTDOWN_CONF = "camel.component.quartz.interruptJobsOnShutdown"; - public static final String CAMEL_SOURCE_QUARTZ_COMPONENT_INTERRUPT_JOBS_ON_SHUTDOWN_DOC = "Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted. When a job is interrupted then Camel will mark the exchange to stop continue routing and set java.util.concurrent.RejectedExecutionException as caused exception. Therefore use this with care, a [...] + public static final String CAMEL_SOURCE_QUARTZ_COMPONENT_INTERRUPT_JOBS_ON_SHUTDOWN_DOC = "Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted."; public static final Boolean CAMEL_SOURCE_QUARTZ_COMPONENT_INTERRUPT_JOBS_ON_SHUTDOWN_DEFAULT = false; public static final String CAMEL_SOURCE_QUARTZ_COMPONENT_START_DELAYED_SECONDS_CONF = "camel.component.quartz.startDelayedSeconds"; public static final String CAMEL_SOURCE_QUARTZ_COMPONENT_START_DELAYED_SECONDS_DOC = "Seconds to wait before starting the quartz scheduler."; diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc index 52ecbb1..80d7a6f 100644 --- a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc @@ -2,7 +2,7 @@ [[camel-aws2-sqs-kafka-connector-sink]] = camel-aws2-sqs-kafka-connector sink configuration -Connector Description: Send and receive messages to/from AWS SQS service using AWS SDK version 2.x. +Connector Description: Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x. When using camel-aws2-sqs-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector: diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc index 32c4bc8..1f125b6 100644 --- a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc @@ -2,7 +2,7 @@ [[camel-aws2-sqs-kafka-connector-source]] = camel-aws2-sqs-kafka-connector source configuration -Connector description: Send and receive messages to/from AWS SQS service using AWS SDK version 2.x. +Connector description: Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x. When using camel-aws2-sqs-kafka-connector as source make sure to use the following Maven dependency to have support for the connector: diff --git a/docs/modules/ROOT/pages/connectors/camel-elasticsearch-rest-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-elasticsearch-rest-kafka-sink-connector.adoc index c9e5dd8..b90c5a1 100644 --- a/docs/modules/ROOT/pages/connectors/camel-elasticsearch-rest-kafka-sink-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-elasticsearch-rest-kafka-sink-connector.adoc @@ -2,7 +2,7 @@ [[camel-elasticsearch-rest-kafka-connector-sink]] = camel-elasticsearch-rest-kafka-connector sink configuration -Connector Description: Send requests to ElasticSearch via REST API +Connector Description: Send requests to with an ElasticSearch via REST API. When using camel-elasticsearch-rest-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector: diff --git a/docs/modules/ROOT/pages/connectors/camel-log-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-log-kafka-sink-connector.adoc index b128be8..fae5692 100644 --- a/docs/modules/ROOT/pages/connectors/camel-log-kafka-sink-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-log-kafka-sink-connector.adoc @@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.log.CamelLogSinkConnector ---- -The camel-log sink connector supports 31 options, which are listed below. +The camel-log sink connector supports 30 options, which are listed below. @@ -44,7 +44,6 @@ The camel-log sink connector supports 31 options, which are listed below. | *camel.sink.endpoint.maxChars* | Limits the number of characters logged per line. | 10000 | false | MEDIUM | *camel.sink.endpoint.multiline* | If enabled then each information is outputted on a newline. | false | false | MEDIUM | *camel.sink.endpoint.showAll* | Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used) | false | false | MEDIUM -| *camel.sink.endpoint.showAllProperties* | Show all of the exchange properties (both internal and custom). | false | false | MEDIUM | *camel.sink.endpoint.showBody* | Show the message body. | true | false | MEDIUM | *camel.sink.endpoint.showBodyType* | Show the body Java type. | true | false | MEDIUM | *camel.sink.endpoint.showCaughtException* | If the exchange has a caught exception, show the exception message (no stack trace). A caught exception is stored as a property on the exchange (using the key org.apache.camel.Exchange#EXCEPTION_CAUGHT) and for instance a doCatch can catch exceptions. | false | false | MEDIUM @@ -54,7 +53,7 @@ The camel-log sink connector supports 31 options, which are listed below. | *camel.sink.endpoint.showFiles* | If enabled Camel will output files | false | false | MEDIUM | *camel.sink.endpoint.showFuture* | If enabled Camel will on Future objects wait for it to complete to obtain the payload to be logged. | false | false | MEDIUM | *camel.sink.endpoint.showHeaders* | Show the message headers. | false | false | MEDIUM -| *camel.sink.endpoint.showProperties* | Show the exchange properties (only custom). Use showAllProperties to show both internal and custom properties. | false | false | MEDIUM +| *camel.sink.endpoint.showProperties* | Show the exchange properties. | false | false | MEDIUM | *camel.sink.endpoint.showStackTrace* | Show the stack trace, if an exchange has an exception. Only effective if one of showAll, showException or showCaughtException are enabled. | false | false | MEDIUM | *camel.sink.endpoint.showStreams* | Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use Stream Caching. | false | false | MEDIUM | *camel.sink.endpoint.skipBodyLineSeparator* | Whether to skip line separators when logging the message body. This allows to log the message body in one line, setting this option to false will preserve any line separators from the body, which then will log the body as is. | true | false | MEDIUM diff --git a/docs/modules/ROOT/pages/connectors/camel-netty-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-netty-kafka-sink-connector.adoc index dd4ef1e..3cd0dc3 100644 --- a/docs/modules/ROOT/pages/connectors/camel-netty-kafka-sink-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-netty-kafka-sink-connector.adoc @@ -2,7 +2,7 @@ [[camel-netty-kafka-connector-sink]] = camel-netty-kafka-connector sink configuration -Connector Description: Socket level networking using TCP or UDP with Netty 4.x. +Connector Description: Socket level networking using TCP or UDP with the Netty 4.x. When using camel-netty-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector: diff --git a/docs/modules/ROOT/pages/connectors/camel-netty-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-netty-kafka-source-connector.adoc index 467085d..07a8199 100644 --- a/docs/modules/ROOT/pages/connectors/camel-netty-kafka-source-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-netty-kafka-source-connector.adoc @@ -2,7 +2,7 @@ [[camel-netty-kafka-connector-source]] = camel-netty-kafka-connector source configuration -Connector description: Socket level networking using TCP or UDP with Netty 4.x. +Connector description: Socket level networking using TCP or UDP with the Netty 4.x. When using camel-netty-kafka-connector as source make sure to use the following Maven dependency to have support for the connector: diff --git a/docs/modules/ROOT/pages/connectors/camel-quartz-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-quartz-kafka-source-connector.adoc index 7fed5df..d2a3c44 100644 --- a/docs/modules/ROOT/pages/connectors/camel-quartz-kafka-source-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-quartz-kafka-source-connector.adoc @@ -62,7 +62,7 @@ The camel-quartz source connector supports 33 options, which are listed below. | *camel.component.quartz.scheduler* | To use the custom configured Quartz scheduler, instead of creating a new Scheduler. | null | false | MEDIUM | *camel.component.quartz.schedulerFactory* | To use the custom SchedulerFactory which is used to create the Scheduler. | null | false | MEDIUM | *camel.component.quartz.autoStartScheduler* | Whether or not the scheduler should be auto started. This options is default true | true | false | MEDIUM -| *camel.component.quartz.interruptJobsOnShutdown* | Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted. When a job is interrupted then Camel will mark the exchange to stop continue routing and set java.util.concurrent.RejectedExecutionException as caused exception. Therefore use this with care, as its often better to allow Camel jobs to [...] +| *camel.component.quartz.interruptJobsOnShutdown* | Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted. | false | false | MEDIUM | *camel.component.quartz.startDelayedSeconds* | Seconds to wait before starting the quartz scheduler. | null | false | MEDIUM |===
