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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 022a1d0 Regen
022a1d0 is described below
commit 022a1d0b239366f462172a8aa62728d3e8a82db1
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Feb 9 09:01:24 2021 +0100
Regen
---
.../apache/camel/springboot/catalog/components/kafka.json | 2 +-
.../camel/springboot/catalog/components/milo-client.json | 1 +
.../camel-kafka-starter/src/main/docs/kafka-starter.adoc | 2 +-
.../kafka/springboot/KafkaComponentConfiguration.java | 6 ++----
.../camel-milo-starter/src/main/docs/milo-starter.adoc | 3 ++-
.../springboot/MiloClientComponentConfiguration.java | 15 +++++++++++++++
.../client/springboot/MiloClientComponentConverter.java | 2 ++
docs/modules/ROOT/pages/kafka-starter.adoc | 2 +-
docs/modules/ROOT/pages/milo-starter.adoc | 3 ++-
9 files changed, 27 insertions(+), 9 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 ab26b6f..48a76bb 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
@@ -92,7 +92,7 @@
"workerPoolCoreSize": { "kind": "property", "displayName": "Worker Pool
Core Size", "group": "producer", "label": "producer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "10",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "Number of core threads
for the worker pool for continue routing Exchange after [...]
"workerPoolMaxSize": { "kind": "property", "displayName": "Worker Pool Max
Size", "group": "producer", "label": "producer", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "20", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Maximum number of threads for the worker pool
for continue routing Exchange after [...]
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
- "kafkaClientFactory": { "kind": "property", "displayName": "Kafka Client
Factory", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.component.kafka.KafkaClientFactory",
"deprecated": false, "autowired": false, "secret": false, "description":
"Factory to use for creating org.apache.kafka.clients.consumer.KafkaConsumer
and org.apache.kafka.clients.producer.KafkaProducer instances. This allows to
configure a custom factory to c [...]
+ "kafkaClientFactory": { "kind": "property", "displayName": "Kafka Client
Factory", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.component.kafka.KafkaClientFactory",
"deprecated": false, "autowired": true, "secret": false, "description":
"Factory to use for creating org.apache.kafka.clients.consumer.KafkaConsumer
and org.apache.kafka.clients.producer.KafkaProducer instances. This allows to
configure a custom factory to cr [...]
"synchronous": { "kind": "property", "displayName": "Synchronous",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Sets whether synchronous processing should be
strictly used" },
"schemaRegistryURL": { "kind": "property", "displayName": "Schema Registry
URL", "group": "confluent", "label": "confluent", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "URL of the Confluent Platform schema registry
servers to use. The format is host1:port1,host2:port2. Thi [...]
"interceptorClasses": { "kind": "property", "displayName": "Interceptor
Classes", "group": "monitoring", "label": "common,monitoring", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Sets interceptors for producer or consumers.
Producer interceptors have to be classes implemen [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-client.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-client.json
index 58a70f5..92a2f60 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-client.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-client.json
@@ -40,6 +40,7 @@
"keyStoreUrl": { "kind": "property", "displayName": "Key Store Url",
"group": "client", "label": "client", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.milo.client.MiloClientConfiguration",
"configurationField": "configuration", "description": "The URL where the key
should be loaded from" },
"maxPendingPublishRequests": { "kind": "property", "displayName": "Max
Pending Publish Requests", "group": "client", "label": "client", "required":
false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.milo.client.MiloClientConfiguration",
"configurationField": "configuration", "description": "The maximum number of
pending publish requests" },
"maxResponseMessageSize": { "kind": "property", "displayName": "Max
Response Message Size", "group": "client", "label": "client", "required":
false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.milo.client.MiloClientConfiguration",
"configurationField": "configuration", "description": "The maximum number of
bytes a response message may have" },
+ "miloClientConnectionManager": { "kind": "property", "displayName": "Milo
Client Connection Manager", "group": "client", "label": "client", "required":
false, "type": "object", "javaType":
"org.apache.camel.component.milo.client.MiloClientConnectionManager",
"deprecated": false, "autowired": true, "secret": false, "description":
"Instance for managing client connections" },
"overrideHost": { "kind": "property", "displayName": "Override Host",
"group": "client", "label": "client", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.milo.client.MiloClientConfiguration",
"configurationField": "configuration", "description": "Override the server
reported endpoint host with the host from the endpoint URI." },
"productUri": { "kind": "property", "displayName": "Product Uri", "group":
"client", "label": "client", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "http:\/\/camel.apache.org\/EclipseMilo", "configurationClass":
"org.apache.camel.component.milo.client.MiloClientConfiguration",
"configurationField": "configuration", "description": "The product URI" },
"requestedPublishingInterval": { "kind": "property", "displayName":
"Requested Publishing Interval", "group": "client", "label": "client",
"required": false, "type": "number", "javaType": "java.lang.Double",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"1_000.0", "configurationClass":
"org.apache.camel.component.milo.client.MiloClientConfiguration",
"configurationField": "configuration", "description": "The requested publishing
interval in milliseconds" },
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 447b47f..4ed532f 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
@@ -54,7 +54,7 @@ The component supports 100 options, which are listed below.
| *camel.component.kafka.header-serializer* | To use a custom
KafkaHeaderSerializer to serialize kafka headers values. The option is a
org.apache.camel.component.kafka.serde.KafkaHeaderSerializer type. | |
KafkaHeaderSerializer
| *camel.component.kafka.heartbeat-interval-ms* | The expected time between
heartbeats to the consumer coordinator when using Kafka's group management
facilities. Heartbeats are used to ensure that the consumer's session stays
active and to facilitate rebalancing when new consumers join or leave the
group. The value must be set lower than session.timeout.ms, but typically
should be set no higher than 1/3 of that value. It can be adjusted even lower
to control the expected time for normal [...]
| *camel.component.kafka.interceptor-classes* | Sets interceptors for producer
or consumers. Producer interceptors have to be classes implementing
org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors
have to be classes implementing
org.apache.kafka.clients.consumer.ConsumerInterceptor Note that if you use
Producer interceptor on a consumer it will throw a class cast exception in
runtime | | String
-| *camel.component.kafka.kafka-client-factory* | Factory to use for creating
org.apache.kafka.clients.consumer.KafkaConsumer and
org.apache.kafka.clients.producer.KafkaProducer instances. This allows to
configure a custom factory to create
org.apache.kafka.clients.consumer.KafkaConsumer and
org.apache.kafka.clients.producer.KafkaProducer instances with logic that
extends the vanilla Kafka clients. The option is a
org.apache.camel.component.kafka.KafkaClientFactory type. | |
KafkaClientFactory
+| *camel.component.kafka.kafka-client-factory* | Factory to use for creating
org.apache.kafka.clients.consumer.KafkaConsumer and
org.apache.kafka.clients.producer.KafkaProducer instances. This allows to
configure a custom factory to create instances with logic that extends the
vanilla Kafka clients. The option is a
org.apache.camel.component.kafka.KafkaClientFactory type. | |
KafkaClientFactory
| *camel.component.kafka.kafka-manual-commit-factory* | Factory to use for
creating KafkaManualCommit instances. This allows to plugin a custom factory to
create custom KafkaManualCommit instances in case special logic is needed when
doing manual commits that deviates from the default implementation that comes
out of the box. The option is a
org.apache.camel.component.kafka.KafkaManualCommitFactory type. | |
KafkaManualCommitFactory
| *camel.component.kafka.kerberos-before-relogin-min-time* | Login thread
sleep time between refresh attempts. | 60000 | Integer
| *camel.component.kafka.kerberos-init-cmd* | Kerberos kinit command path.
Default is /usr/bin/kinit | /usr/bin/kinit | String
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 c65e52f..b0c8719 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
@@ -544,10 +544,8 @@ public class KafkaComponentConfiguration
* Factory to use for creating
* org.apache.kafka.clients.consumer.KafkaConsumer and
* org.apache.kafka.clients.producer.KafkaProducer instances. This allows
to
- * configure a custom factory to create
- * org.apache.kafka.clients.consumer.KafkaConsumer and
- * org.apache.kafka.clients.producer.KafkaProducer instances with logic
that
- * extends the vanilla Kafka clients. The option is a
+ * configure a custom factory to create instances with logic that extends
+ * the vanilla Kafka clients. The option is a
* org.apache.camel.component.kafka.KafkaClientFactory type.
*/
private KafkaClientFactory kafkaClientFactory;
diff --git
a/components-starter/camel-milo-starter/src/main/docs/milo-starter.adoc
b/components-starter/camel-milo-starter/src/main/docs/milo-starter.adoc
index dfa9815..aaaf32c 100644
--- a/components-starter/camel-milo-starter/src/main/docs/milo-starter.adoc
+++ b/components-starter/camel-milo-starter/src/main/docs/milo-starter.adoc
@@ -17,7 +17,7 @@ When using milo with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 46 options, which are listed below.
+The component supports 47 options, which are listed below.
@@ -43,6 +43,7 @@ The component supports 46 options, which are listed below.
| *camel.component.milo-client.lazy-start-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 processe [...]
| *camel.component.milo-client.max-pending-publish-requests* | The maximum
number of pending publish requests | | Long
| *camel.component.milo-client.max-response-message-size* | The maximum number
of bytes a response message may have | | Long
+| *camel.component.milo-client.milo-client-connection-manager* | Instance for
managing client connections. The option is a
org.apache.camel.component.milo.client.MiloClientConnectionManager type. | |
MiloClientConnectionManager
| *camel.component.milo-client.override-host* | Override the server reported
endpoint host with the host from the endpoint URI. | false | Boolean
| *camel.component.milo-client.product-uri* | The product URI |
http://camel.apache.org/EclipseMilo | String
| *camel.component.milo-client.request-timeout* | Request timeout in
milliseconds | | Long
diff --git
a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java
b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java
index 8619685..3ad438e 100644
---
a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java
+++
b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.milo.client.springboot;
import javax.annotation.Generated;
import org.apache.camel.component.milo.client.MiloClientConfiguration;
+import org.apache.camel.component.milo.client.MiloClientConnectionManager;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -130,6 +131,11 @@ public class MiloClientComponentConfiguration
*/
private Long maxResponseMessageSize;
/**
+ * Instance for managing client connections. The option is a
+ * org.apache.camel.component.milo.client.MiloClientConnectionManager type.
+ */
+ private MiloClientConnectionManager miloClientConnectionManager;
+ /**
* Override the server reported endpoint host with the host from the
* endpoint URI.
*/
@@ -299,6 +305,15 @@ public class MiloClientComponentConfiguration
this.maxResponseMessageSize = maxResponseMessageSize;
}
+ public MiloClientConnectionManager getMiloClientConnectionManager() {
+ return miloClientConnectionManager;
+ }
+
+ public void setMiloClientConnectionManager(
+ MiloClientConnectionManager miloClientConnectionManager) {
+ this.miloClientConnectionManager = miloClientConnectionManager;
+ }
+
public Boolean getOverrideHost() {
return overrideHost;
}
diff --git
a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConverter.java
b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConverter.java
index ad18f37..ab5553c 100644
---
a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConverter.java
+++
b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConverter.java
@@ -42,6 +42,7 @@ public class MiloClientComponentConverter implements
GenericConverter {
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.milo.client.MiloClientConfiguration.class));
+ answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.milo.client.MiloClientConnectionManager.class));
return answer;
}
@@ -59,6 +60,7 @@ public class MiloClientComponentConverter implements
GenericConverter {
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
case
"org.apache.camel.component.milo.client.MiloClientConfiguration": return
applicationContext.getBean(ref,
org.apache.camel.component.milo.client.MiloClientConfiguration.class);
+ case
"org.apache.camel.component.milo.client.MiloClientConnectionManager": return
applicationContext.getBean(ref,
org.apache.camel.component.milo.client.MiloClientConnectionManager.class);
}
return null;
}
diff --git a/docs/modules/ROOT/pages/kafka-starter.adoc
b/docs/modules/ROOT/pages/kafka-starter.adoc
index 447b47f..4ed532f 100644
--- a/docs/modules/ROOT/pages/kafka-starter.adoc
+++ b/docs/modules/ROOT/pages/kafka-starter.adoc
@@ -54,7 +54,7 @@ The component supports 100 options, which are listed below.
| *camel.component.kafka.header-serializer* | To use a custom
KafkaHeaderSerializer to serialize kafka headers values. The option is a
org.apache.camel.component.kafka.serde.KafkaHeaderSerializer type. | |
KafkaHeaderSerializer
| *camel.component.kafka.heartbeat-interval-ms* | The expected time between
heartbeats to the consumer coordinator when using Kafka's group management
facilities. Heartbeats are used to ensure that the consumer's session stays
active and to facilitate rebalancing when new consumers join or leave the
group. The value must be set lower than session.timeout.ms, but typically
should be set no higher than 1/3 of that value. It can be adjusted even lower
to control the expected time for normal [...]
| *camel.component.kafka.interceptor-classes* | Sets interceptors for producer
or consumers. Producer interceptors have to be classes implementing
org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors
have to be classes implementing
org.apache.kafka.clients.consumer.ConsumerInterceptor Note that if you use
Producer interceptor on a consumer it will throw a class cast exception in
runtime | | String
-| *camel.component.kafka.kafka-client-factory* | Factory to use for creating
org.apache.kafka.clients.consumer.KafkaConsumer and
org.apache.kafka.clients.producer.KafkaProducer instances. This allows to
configure a custom factory to create
org.apache.kafka.clients.consumer.KafkaConsumer and
org.apache.kafka.clients.producer.KafkaProducer instances with logic that
extends the vanilla Kafka clients. The option is a
org.apache.camel.component.kafka.KafkaClientFactory type. | |
KafkaClientFactory
+| *camel.component.kafka.kafka-client-factory* | Factory to use for creating
org.apache.kafka.clients.consumer.KafkaConsumer and
org.apache.kafka.clients.producer.KafkaProducer instances. This allows to
configure a custom factory to create instances with logic that extends the
vanilla Kafka clients. The option is a
org.apache.camel.component.kafka.KafkaClientFactory type. | |
KafkaClientFactory
| *camel.component.kafka.kafka-manual-commit-factory* | Factory to use for
creating KafkaManualCommit instances. This allows to plugin a custom factory to
create custom KafkaManualCommit instances in case special logic is needed when
doing manual commits that deviates from the default implementation that comes
out of the box. The option is a
org.apache.camel.component.kafka.KafkaManualCommitFactory type. | |
KafkaManualCommitFactory
| *camel.component.kafka.kerberos-before-relogin-min-time* | Login thread
sleep time between refresh attempts. | 60000 | Integer
| *camel.component.kafka.kerberos-init-cmd* | Kerberos kinit command path.
Default is /usr/bin/kinit | /usr/bin/kinit | String
diff --git a/docs/modules/ROOT/pages/milo-starter.adoc
b/docs/modules/ROOT/pages/milo-starter.adoc
index dfa9815..aaaf32c 100644
--- a/docs/modules/ROOT/pages/milo-starter.adoc
+++ b/docs/modules/ROOT/pages/milo-starter.adoc
@@ -17,7 +17,7 @@ When using milo with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 46 options, which are listed below.
+The component supports 47 options, which are listed below.
@@ -43,6 +43,7 @@ The component supports 46 options, which are listed below.
| *camel.component.milo-client.lazy-start-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 processe [...]
| *camel.component.milo-client.max-pending-publish-requests* | The maximum
number of pending publish requests | | Long
| *camel.component.milo-client.max-response-message-size* | The maximum number
of bytes a response message may have | | Long
+| *camel.component.milo-client.milo-client-connection-manager* | Instance for
managing client connections. The option is a
org.apache.camel.component.milo.client.MiloClientConnectionManager type. | |
MiloClientConnectionManager
| *camel.component.milo-client.override-host* | Override the server reported
endpoint host with the host from the endpoint URI. | false | Boolean
| *camel.component.milo-client.product-uri* | The product URI |
http://camel.apache.org/EclipseMilo | String
| *camel.component.milo-client.request-timeout* | Request timeout in
milliseconds | | Long
