You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/10/29 18:57:11 UTC
[camel] 10/13: CAMEL-15770 - Kafka serialize/deserialize properties
are inconsistently named - kafkaHeaderDeserializer
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.git
commit 55b06778aca3d903496a66d686c6a43cc81d160c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 29 19:30:51 2020 +0100
CAMEL-15770 - Kafka serialize/deserialize properties are inconsistently named - kafkaHeaderDeserializer
---
.../org/apache/camel/component/kafka/KafkaConfiguration.java | 12 ++++++------
.../java/org/apache/camel/component/kafka/KafkaConsumer.java | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
index ae251a4..0bb1fec 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
@@ -75,7 +75,7 @@ public class KafkaConfiguration implements Cloneable, HeaderFilterStrategyAware
@UriParam(label = "consumer", defaultValue = "1")
private int consumersCount = 1;
@UriParam(label = "consumer", description = "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values")
- private KafkaHeaderDeserializer kafkaHeaderDeserializer = new DefaultKafkaHeaderDeserializer();
+ private KafkaHeaderDeserializer headerDeserializer = new DefaultKafkaHeaderDeserializer();
// interceptor.classes
@UriParam(label = "common,monitoring")
@@ -1674,17 +1674,17 @@ public class KafkaConfiguration implements Cloneable, HeaderFilterStrategyAware
this.headerFilterStrategy = headerFilterStrategy;
}
- public KafkaHeaderDeserializer getKafkaHeaderDeserializer() {
- return kafkaHeaderDeserializer;
+ public KafkaHeaderDeserializer getHeaderDeserializer() {
+ return headerDeserializer;
}
/**
* Sets custom KafkaHeaderDeserializer for deserialization kafka headers values to camel headers values.
*
- * @param kafkaHeaderDeserializer custom kafka header deserializer to be used
+ * @param headerDeserializer custom kafka header deserializer to be used
*/
- public void setKafkaHeaderDeserializer(final KafkaHeaderDeserializer kafkaHeaderDeserializer) {
- this.kafkaHeaderDeserializer = kafkaHeaderDeserializer;
+ public void setHeaderDeserializer(final KafkaHeaderDeserializer headerDeserializer) {
+ this.headerDeserializer = headerDeserializer;
}
public KafkaHeaderSerializer getHeaderSerializer() {
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index 0cba5e0..f406125 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -515,7 +515,7 @@ public class KafkaConsumer extends DefaultConsumer {
private void propagateHeaders(
ConsumerRecord<Object, Object> record, Exchange exchange, KafkaConfiguration kafkaConfiguration) {
HeaderFilterStrategy headerFilterStrategy = kafkaConfiguration.getHeaderFilterStrategy();
- KafkaHeaderDeserializer headerDeserializer = kafkaConfiguration.getKafkaHeaderDeserializer();
+ KafkaHeaderDeserializer headerDeserializer = kafkaConfiguration.getHeaderDeserializer();
StreamSupport.stream(record.headers().spliterator(), false)
.filter(header -> shouldBeFiltered(header, exchange, headerFilterStrategy))
.forEach(header -> exchange.getIn().setHeader(header.key(),