This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new ee4dc60cdda Sync and regen
ee4dc60cdda is described below
commit ee4dc60cdda5ecab86c39d7e799c4d35a19f20b2
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Jul 5 11:39:08 2023 +0200
Sync and regen
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../apache/camel/springboot/catalog/components/kafka.json | 4 ++--
.../camel/springboot/catalog/components/micrometer.json | 2 +-
.../camel/springboot/catalog/dataformats/parquetAvro.json | 5 +++--
.../camel-kafka-starter/src/main/docs/kafka.json | 4 ++--
.../kafka/springboot/KafkaComponentConfiguration.java | 8 ++++----
.../src/main/docs/parquet-avro.json | 7 +++++++
.../avro/springboot/ParquetAvroDataFormatConfiguration.java | 12 ++++++++++++
components-starter/camel-pulsar-starter/pom.xml | 8 --------
8 files changed, 31 insertions(+), 19 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 bb3b0d057fd..3002082bb77 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
@@ -48,7 +48,7 @@
"heartbeatIntervalMs": { "index": 23, "kind": "property", "displayName":
"Heartbeat Interval Ms", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "3000",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The expected time
between heartbeats to the consumer coordinato [...]
"keyDeserializer": { "index": 24, "kind": "property", "displayName": "Key
Deserializer", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue":
"org.apache.kafka.common.serialization.StringDeserializer",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "Deserializer class for
[...]
"maxPartitionFetchBytes": { "index": 25, "kind": "property",
"displayName": "Max Partition Fetch Bytes", "group": "consumer", "label":
"consumer", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1048576", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The maximum amount of data per-partition the
server w [...]
- "maxPollIntervalMs": { "index": 26, "kind": "property", "displayName":
"Max Poll Interval Ms", "group": "consumer", "label": "consumer", "required":
false, "type": "duration", "javaType": "java.lang.Long", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The maximum delay between invocations of
poll() when using consumer group management. This p [...]
+ "maxPollIntervalMs": { "index": 26, "kind": "property", "displayName":
"Max Poll Interval Ms", "group": "consumer", "label": "consumer", "required":
false, "type": "duration", "javaType": "java.lang.Integer", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The maximum delay between invocations of
poll() when using consumer group management. Thi [...]
"maxPollRecords": { "index": 27, "kind": "property", "displayName": "Max
Poll Records", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "500",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The maximum number of
records returned in a single call to poll()" },
"offsetRepository": { "index": 28, "kind": "property", "displayName":
"Offset Repository", "group": "consumer", "label": "consumer", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.StateRepository<java.lang.String, java.lang.String>",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The offset repository to use in order to [...]
"partitionAssignor": { "index": 29, "kind": "property", "displayName":
"Partition Assignor", "group": "consumer", "label": "consumer", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue":
"org.apache.kafka.clients.consumer.RangeAssignor", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The class name of the parti [...]
@@ -172,7 +172,7 @@
"heartbeatIntervalMs": { "index": 22, "kind": "parameter", "displayName":
"Heartbeat Interval Ms", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "3000",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The expected time
between heartbeats to the consumer coordinat [...]
"keyDeserializer": { "index": 23, "kind": "parameter", "displayName": "Key
Deserializer", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue":
"org.apache.kafka.common.serialization.StringDeserializer",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "Deserializer class fo
[...]
"maxPartitionFetchBytes": { "index": 24, "kind": "parameter",
"displayName": "Max Partition Fetch Bytes", "group": "consumer", "label":
"consumer", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1048576", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The maximum amount of data per-partition the
server [...]
- "maxPollIntervalMs": { "index": 25, "kind": "parameter", "displayName":
"Max Poll Interval Ms", "group": "consumer", "label": "consumer", "required":
false, "type": "duration", "javaType": "java.lang.Long", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The maximum delay between invocations of
poll() when using consumer group management. This [...]
+ "maxPollIntervalMs": { "index": 25, "kind": "parameter", "displayName":
"Max Poll Interval Ms", "group": "consumer", "label": "consumer", "required":
false, "type": "duration", "javaType": "java.lang.Integer", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The maximum delay between invocations of
poll() when using consumer group management. Th [...]
"maxPollRecords": { "index": 26, "kind": "parameter", "displayName": "Max
Poll Records", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "500",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The maximum number of
records returned in a single call to poll()" },
"offsetRepository": { "index": 27, "kind": "parameter", "displayName":
"Offset Repository", "group": "consumer", "label": "consumer", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.StateRepository<java.lang.String, java.lang.String>",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The offset repository to use in order t [...]
"partitionAssignor": { "index": 28, "kind": "parameter", "displayName":
"Partition Assignor", "group": "consumer", "label": "consumer", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue":
"org.apache.kafka.clients.consumer.RangeAssignor", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The class name of the part [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/micrometer.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/micrometer.json
index 1b68c91187b..014a0842dbc 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/micrometer.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/micrometer.json
@@ -36,7 +36,7 @@
"CamelMetricsTags": { "index": 6, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType":
"java.lang.Iterable<Tag>", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "To augment meter tags
defined as URI parameters", "constantName":
"org.apache.camel.component.micrometer.MicrometerConstants#HEADER_METRIC_TAGS" }
},
"properties": {
- "metricsType": { "index": 0, "kind": "path", "displayName": "Metrics
Type", "group": "producer", "label": "", "required": true, "type": "object",
"javaType": "io.micrometer.core.instrument.Meter.Type", "enum": [ "counter",
"distribution_summary", "timer" ], "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Type of metrics" },
+ "metricsType": { "index": 0, "kind": "path", "displayName": "Metrics
Type", "group": "producer", "label": "", "required": true, "type": "object",
"javaType": "io.micrometer.core.instrument.Meter.Type", "enum": [ "counter",
"summary", "timer" ], "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Type of metrics" },
"metricsName": { "index": 1, "kind": "path", "displayName": "Metrics
Name", "group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Name of metrics" },
"tags": { "index": 2, "kind": "path", "displayName": "Tags", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"java.lang.Iterable<io.micrometer.core.instrument.Tag>", "deprecated": false,
"autowired": false, "secret": false, "description": "Tags of metrics" },
"action": { "index": 3, "kind": "parameter", "displayName": "Action",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "start", "stop" ], "deprecated":
false, "autowired": false, "secret": false, "description": "Action expression
when using timer type" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/parquetAvro.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/parquetAvro.json
index aa8045ff313..3ffce919490 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/parquetAvro.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/parquetAvro.json
@@ -16,7 +16,8 @@
"modelJavaType": "org.apache.camel.model.dataformat.ParquetAvroDataFormat"
},
"properties": {
- "unmarshalType": { "index": 0, "kind": "attribute", "displayName":
"Unmarshal Type", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Class to use when unmarshalling." },
- "id": { "index": 1, "kind": "attribute", "displayName": "Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
+ "compressionCodecName": { "index": 0, "kind": "attribute", "displayName":
"Compression Codec Name", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "GZIP", "description": "Compression codec to use when
marshalling." },
+ "unmarshalType": { "index": 1, "kind": "attribute", "displayName":
"Unmarshal Type", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Class to use when unmarshalling." },
+ "id": { "index": 2, "kind": "attribute", "displayName": "Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git a/components-starter/camel-kafka-starter/src/main/docs/kafka.json
b/components-starter/camel-kafka-starter/src/main/docs/kafka.json
index e86a21339e6..af1c0a0be9a 100644
--- a/components-starter/camel-kafka-starter/src/main/docs/kafka.json
+++ b/components-starter/camel-kafka-starter/src/main/docs/kafka.json
@@ -353,8 +353,8 @@
},
{
"name": "camel.component.kafka.max-poll-interval-ms",
- "type": "java.lang.Long",
- "description": "The maximum delay between invocations of poll() when
using consumer group management. This places an upper bound on the amount of
time that the consumer can be idle before fetching more records. If poll() is
not called before expiration of this timeout, then the consumer is considered
failed and the group will rebalance in order to reassign the partitions to
another member. The option is a java.lang.Long type.",
+ "type": "java.lang.Integer",
+ "description": "The maximum delay between invocations of poll() when
using consumer group management. This places an upper bound on the amount of
time that the consumer can be idle before fetching more records. If poll() is
not called before expiration of this timeout, then the consumer is considered
failed and the group will rebalance in order to reassign the partitions to
another member. The option is a java.lang.Integer type.",
"sourceType":
"org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration"
},
{
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 fd44e6d56ad..afefd40d28d 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
@@ -237,9 +237,9 @@ public class KafkaComponentConfiguration
* consumer can be idle before fetching more records. If poll() is not
* called before expiration of this timeout, then the consumer is
considered
* failed and the group will rebalance in order to reassign the partitions
- * to another member. The option is a java.lang.Long type.
+ * to another member. The option is a java.lang.Integer type.
*/
- private Long maxPollIntervalMs;
+ private Integer maxPollIntervalMs;
/**
* The maximum number of records returned in a single call to poll()
*/
@@ -1047,11 +1047,11 @@ public class KafkaComponentConfiguration
this.maxPartitionFetchBytes = maxPartitionFetchBytes;
}
- public Long getMaxPollIntervalMs() {
+ public Integer getMaxPollIntervalMs() {
return maxPollIntervalMs;
}
- public void setMaxPollIntervalMs(Long maxPollIntervalMs) {
+ public void setMaxPollIntervalMs(Integer maxPollIntervalMs) {
this.maxPollIntervalMs = maxPollIntervalMs;
}
diff --git
a/components-starter/camel-parquet-avro-starter/src/main/docs/parquet-avro.json
b/components-starter/camel-parquet-avro-starter/src/main/docs/parquet-avro.json
index ee2fc83acdb..b4828426ee5 100644
---
a/components-starter/camel-parquet-avro-starter/src/main/docs/parquet-avro.json
+++
b/components-starter/camel-parquet-avro-starter/src/main/docs/parquet-avro.json
@@ -13,6 +13,13 @@
}
],
"properties": [
+ {
+ "name": "camel.dataformat.parquet-avro.compression-codec-name",
+ "type": "java.lang.String",
+ "description": "Compression codec to use when marshalling.",
+ "sourceType":
"org.apache.camel.dataformat.parquet.avro.springboot.ParquetAvroDataFormatConfiguration",
+ "defaultValue": "GZIP"
+ },
{
"name": "camel.dataformat.parquet-avro.customizer.enabled",
"type": "java.lang.Boolean",
diff --git
a/components-starter/camel-parquet-avro-starter/src/main/java/org/apache/camel/dataformat/parquet/avro/springboot/ParquetAvroDataFormatConfiguration.java
b/components-starter/camel-parquet-avro-starter/src/main/java/org/apache/camel/dataformat/parquet/avro/springboot/ParquetAvroDataFormatConfiguration.java
index 1e4dc8b8d46..d2f3abdff27 100644
---
a/components-starter/camel-parquet-avro-starter/src/main/java/org/apache/camel/dataformat/parquet/avro/springboot/ParquetAvroDataFormatConfiguration.java
+++
b/components-starter/camel-parquet-avro-starter/src/main/java/org/apache/camel/dataformat/parquet/avro/springboot/ParquetAvroDataFormatConfiguration.java
@@ -34,11 +34,23 @@ public class ParquetAvroDataFormatConfiguration
* is enabled by default.
*/
private Boolean enabled;
+ /**
+ * Compression codec to use when marshalling.
+ */
+ private String compressionCodecName = "GZIP";
/**
* Class to use when unmarshalling.
*/
private String unmarshalType;
+ public String getCompressionCodecName() {
+ return compressionCodecName;
+ }
+
+ public void setCompressionCodecName(String compressionCodecName) {
+ this.compressionCodecName = compressionCodecName;
+ }
+
public String getUnmarshalType() {
return unmarshalType;
}
diff --git a/components-starter/camel-pulsar-starter/pom.xml
b/components-starter/camel-pulsar-starter/pom.xml
index 0f67dfa8a6a..7caa0936c34 100644
--- a/components-starter/camel-pulsar-starter/pom.xml
+++ b/components-starter/camel-pulsar-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-pulsar</artifactId>
<version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
