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:08 UTC
[camel] 07/13: CAMEL-15770 - Kafka serialize/deserialize properties
are inconsistently named - kafkaHeaderSerializer
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 dab36bdfe783fe6f2e385f7eb8f2cff43bb697a1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 29 19:21:45 2020 +0100
CAMEL-15770 - Kafka serialize/deserialize properties are inconsistently named - kafkaHeaderSerializer
---
.../org/apache/camel/component/kafka/KafkaConfiguration.java | 10 +++++-----
.../java/org/apache/camel/component/kafka/KafkaProducer.java | 2 +-
2 files changed, 6 insertions(+), 6 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 922420b..266012c 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
@@ -226,7 +226,7 @@ public class KafkaConfiguration implements Cloneable, HeaderFilterStrategyAware
@UriParam(label = "producer", defaultValue = "false")
private boolean enableIdempotence;
@UriParam(label = "producer", description = "To use a custom KafkaHeaderSerializer to serialize kafka headers values")
- private KafkaHeaderSerializer kafkaHeaderSerializer = new DefaultKafkaHeaderSerializer();
+ private KafkaHeaderSerializer headerSerializer = new DefaultKafkaHeaderSerializer();
// reconnect.backoff.max.ms
@UriParam(label = "common", defaultValue = "1000")
@@ -1687,8 +1687,8 @@ public class KafkaConfiguration implements Cloneable, HeaderFilterStrategyAware
this.kafkaHeaderDeserializer = kafkaHeaderDeserializer;
}
- public KafkaHeaderSerializer getKafkaHeaderSerializer() {
- return kafkaHeaderSerializer;
+ public KafkaHeaderSerializer getHeaderSerializer() {
+ return headerSerializer;
}
/**
@@ -1696,8 +1696,8 @@ public class KafkaConfiguration implements Cloneable, HeaderFilterStrategyAware
*
* @param kafkaHeaderSerializer custom kafka header serializer to be used
*/
- public void setKafkaHeaderSerializer(final KafkaHeaderSerializer kafkaHeaderSerializer) {
- this.kafkaHeaderSerializer = kafkaHeaderSerializer;
+ public void setKafkaHeaderSerializer(final KafkaHeaderSerializer headerSerializer) {
+ this.headerSerializer = headerSerializer;
}
/**
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index 0466514..153e225 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -285,7 +285,7 @@ public class KafkaProducer extends DefaultAsyncProducer {
private List<Header> getPropagatedHeaders(Exchange exchange, KafkaConfiguration getConfiguration) {
HeaderFilterStrategy headerFilterStrategy = getConfiguration.getHeaderFilterStrategy();
- KafkaHeaderSerializer headerSerializer = getConfiguration.getKafkaHeaderSerializer();
+ KafkaHeaderSerializer headerSerializer = getConfiguration.getHeaderSerializer();
return exchange.getIn().getHeaders().entrySet().stream()
.filter(entry -> shouldBeFiltered(entry, exchange, headerFilterStrategy))
.map(entry -> getRecordHeader(entry, headerSerializer)).filter(Objects::nonNull).collect(Collectors.toList());