This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 3842a1d Camel-Kafka-Starter: Regen
3842a1d is described below
commit 3842a1d6f988414eeabd30eeeb7a20e36be52a67
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Feb 26 12:59:46 2020 +0100
Camel-Kafka-Starter: Regen
---
.../apache/camel/springboot/catalog/components/kafka.json | 1 -
components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++
.../camel-kafka-starter/src/main/docs/kafka-starter.adoc | 4 +---
.../kafka/springboot/KafkaComponentConfiguration.java | 15 ---------------
docs/modules/ROOT/pages/kafka-starter.adoc | 4 +---
5 files changed, 14 insertions(+), 22 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
index edb79b7..25e5290 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
@@ -19,7 +19,6 @@
"version": "3.1.0-SNAPSHOT"
},
"componentProperties": {
- "brokers": { "kind": "property", "displayName": "Brokers", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "description": "URL of the Kafka brokers
to use. The format is host1:port1,host2:port2, and the list can be a subset of
brokers or a VIP pointing to a subset of brokers. This option is known as
bootstrap.servers in the Kafka documentation." },
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.component.kafka.KafkaConfiguration", "deprecated": false,
"secret": false, "description": "Allows to pre-configure the Kafka component
with common options that the endpoints will reuse." },
"allowManualCommit": { "kind": "property", "displayName": "Allow Manual
Commit", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "false", "description": "Whether to allow doing manual commits
via KafkaManualCommit. If this option is enabled then an instance of
KafkaManualCommit is stored on the Exchange message header, which allows end
users to access this API and perform manu [...]
"breakOnFirstError": { "kind": "property", "displayName": "Break On First
Error", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "false", "description": "This options controls what happens
when a consumer is processing an exchange and it fails. If the option is false
then the consumer continues to the next message and processes it. If the option
is true then the consumer brea [...]
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 47eae69..d834111 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/components-starter/camel-kafka-starter/src/main/docs/kafka-starter.adoc
b/components-starter/camel-kafka-starter/src/main/docs/kafka-starter.adoc
index 0cc136d..ed7cb45 100644
--- a/components-starter/camel-kafka-starter/src/main/docs/kafka-starter.adoc
+++ b/components-starter/camel-kafka-starter/src/main/docs/kafka-starter.adoc
@@ -17,7 +17,7 @@ When using kafka with Spring Boot make sure to use the
following Maven dependenc
----
-The component supports 101 options, which are listed below.
+The component supports 100 options, which are listed below.
@@ -28,7 +28,6 @@ The component supports 101 options, which are listed below.
| *camel.component.kafka.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
| *camel.component.kafka.break-on-first-error* | This options controls what
happens when a consumer is processing an exchange and it fails. If the option
is false then the consumer continues to the next message and processes it. If
the option is true then the consumer breaks out, and will seek back to offset
of the message that caused a failure, and then re-attempt to process this
message. However this can lead to endless processing of the same message if its
bound to fail every time, eg [...]
| *camel.component.kafka.bridge-error-handler* | 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
-| *camel.component.kafka.brokers* | URL of the Kafka brokers to use. The
format is host1:port1,host2:port2, and the list can be a subset of brokers or a
VIP pointing to a subset of brokers. This option is known as bootstrap.servers
in the Kafka documentation. | | String
| *camel.component.kafka.configuration.additional-properties* | Sets
additional properties for either kafka consumer or kafka producer in case they
can't be set directly on the camel 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
| | Map
| *camel.component.kafka.configuration.allow-manual-commit* | Whether to allow
doing manual commits via KafkaManualCommit. If this option is enabled then an
instance of KafkaManualCommit is stored on the Exchange message header, which
allows end users to access this API and perform manual offset commits via the
Kafka consumer. | false | Boolean
| *camel.component.kafka.configuration.auto-commit-enable* | If true,
periodically commit to ZooKeeper the offset of messages already fetched by the
consumer. This committed offset will be used when the process fails as the
position from which the new consumer will begin. | true | Boolean
@@ -126,5 +125,4 @@ The component supports 101 options, which are listed below.
| *camel.component.kafka.use-global-ssl-context-parameters* | Enable usage of
global SSL context parameters. | false | Boolean
| *camel.component.kafka.worker-pool* | To use a shared custom worker pool for
continue routing Exchange after kafka server has acknowledge the message that
was sent to it from KafkaProducer using asynchronous non-blocking processing.
If using this option then you must handle the lifecycle of the thread pool to
shut the pool down when no longer needed. The option is a
java.util.concurrent.ExecutorService type. | | String
|===
-
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
index cc3f19b..e3e5d56 100644
---
a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
+++
b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
@@ -45,13 +45,6 @@ public class KafkaComponentConfiguration
*/
private Boolean enabled;
/**
- * URL of the Kafka brokers to use. The format is host1:port1,host2:port2,
- * and the list can be a subset of brokers or a VIP pointing to a subset of
- * brokers. This option is known as bootstrap.servers in the Kafka
- * documentation.
- */
- private String brokers;
- /**
* Allows to pre-configure the Kafka component with common options that the
* endpoints will reuse.
*/
@@ -121,14 +114,6 @@ public class KafkaComponentConfiguration
*/
private Boolean useGlobalSslContextParameters = false;
- public String getBrokers() {
- return brokers;
- }
-
- public void setBrokers(String brokers) {
- this.brokers = brokers;
- }
-
public KafkaConfigurationNestedConfiguration getConfiguration() {
return configuration;
}
diff --git a/docs/modules/ROOT/pages/kafka-starter.adoc
b/docs/modules/ROOT/pages/kafka-starter.adoc
index 0cc136d..ed7cb45 100644
--- a/docs/modules/ROOT/pages/kafka-starter.adoc
+++ b/docs/modules/ROOT/pages/kafka-starter.adoc
@@ -17,7 +17,7 @@ When using kafka with Spring Boot make sure to use the
following Maven dependenc
----
-The component supports 101 options, which are listed below.
+The component supports 100 options, which are listed below.
@@ -28,7 +28,6 @@ The component supports 101 options, which are listed below.
| *camel.component.kafka.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
| *camel.component.kafka.break-on-first-error* | This options controls what
happens when a consumer is processing an exchange and it fails. If the option
is false then the consumer continues to the next message and processes it. If
the option is true then the consumer breaks out, and will seek back to offset
of the message that caused a failure, and then re-attempt to process this
message. However this can lead to endless processing of the same message if its
bound to fail every time, eg [...]
| *camel.component.kafka.bridge-error-handler* | 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
-| *camel.component.kafka.brokers* | URL of the Kafka brokers to use. The
format is host1:port1,host2:port2, and the list can be a subset of brokers or a
VIP pointing to a subset of brokers. This option is known as bootstrap.servers
in the Kafka documentation. | | String
| *camel.component.kafka.configuration.additional-properties* | Sets
additional properties for either kafka consumer or kafka producer in case they
can't be set directly on the camel 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
| | Map
| *camel.component.kafka.configuration.allow-manual-commit* | Whether to allow
doing manual commits via KafkaManualCommit. If this option is enabled then an
instance of KafkaManualCommit is stored on the Exchange message header, which
allows end users to access this API and perform manual offset commits via the
Kafka consumer. | false | Boolean
| *camel.component.kafka.configuration.auto-commit-enable* | If true,
periodically commit to ZooKeeper the offset of messages already fetched by the
consumer. This committed offset will be used when the process fails as the
position from which the new consumer will begin. | true | Boolean
@@ -126,5 +125,4 @@ The component supports 101 options, which are listed below.
| *camel.component.kafka.use-global-ssl-context-parameters* | Enable usage of
global SSL context parameters. | false | Boolean
| *camel.component.kafka.worker-pool* | To use a shared custom worker pool for
continue routing Exchange after kafka server has acknowledge the message that
was sent to it from KafkaProducer using asynchronous non-blocking processing.
If using this option then you must handle the lifecycle of the thread pool to
shut the pool down when no longer needed. The option is a
java.util.concurrent.ExecutorService type. | | String
|===
-
// spring-boot-auto-configure options: END
