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:02 UTC
[camel] 01/13: CAMEL-15770 - Kafka serialize/deserialize properties
are inconsistently named - keySerializerClass
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 0aa75eeb3f9fd72e69a47d7dba845327a5dc64e1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 29 18:35:58 2020 +0100
CAMEL-15770 - Kafka serialize/deserialize properties are inconsistently named - keySerializerClass
---
.../org/apache/camel/component/kafka/KafkaConfiguration.java | 12 ++++++------
.../java/org/apache/camel/component/kafka/KafkaProducer.java | 4 ++--
.../org/apache/camel/component/kafka/KafkaComponentTest.java | 2 +-
3 files changed, 9 insertions(+), 9 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 b5f580f..1f25c14 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
@@ -160,7 +160,7 @@ public class KafkaConfiguration implements Cloneable, HeaderFilterStrategyAware
@UriParam(label = "producer", defaultValue = KafkaConstants.KAFKA_DEFAULT_SERIALIZER)
private String serializerClass = KafkaConstants.KAFKA_DEFAULT_SERIALIZER;
@UriParam(label = "producer", defaultValue = KafkaConstants.KAFKA_DEFAULT_SERIALIZER)
- private String keySerializerClass = KafkaConstants.KAFKA_DEFAULT_SERIALIZER;
+ private String keySerializer = KafkaConstants.KAFKA_DEFAULT_SERIALIZER;
@UriParam(label = "producer")
private String key;
@@ -340,7 +340,7 @@ public class KafkaConfiguration implements Cloneable, HeaderFilterStrategyAware
public Properties createProducerProperties() {
Properties props = new Properties();
- addPropertyIfNotNull(props, ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, getKeySerializerClass());
+ addPropertyIfNotNull(props, ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, getKeySerializer());
addPropertyIfNotNull(props, ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, getSerializerClass());
addPropertyIfNotNull(props, ProducerConfig.ACKS_CONFIG, getRequestRequiredAcks());
addPropertyIfNotNull(props, ProducerConfig.BUFFER_MEMORY_CONFIG, getBufferMemorySize());
@@ -886,15 +886,15 @@ public class KafkaConfiguration implements Cloneable, HeaderFilterStrategyAware
this.serializerClass = serializerClass;
}
- public String getKeySerializerClass() {
- return keySerializerClass;
+ public String getKeySerializer() {
+ return keySerializer;
}
/**
* The serializer class for keys (defaults to the same as for messages if nothing is given).
*/
- public void setKeySerializerClass(String keySerializerClass) {
- this.keySerializerClass = keySerializerClass;
+ public void setKeySerializer(String keySerializer) {
+ this.keySerializer = keySerializer;
}
public String getKerberosInitCmd() {
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 7fbb73e..ef7b241 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
@@ -224,7 +224,7 @@ public class KafkaProducer extends DefaultAsyncProducer {
final Object messageKey = innerKey != null
? tryConvertToSerializedType(innerExchange, innerKey,
- endpoint.getConfiguration().getKeySerializerClass())
+ endpoint.getConfiguration().getKeySerializer())
: null;
hasMessageKey = messageKey != null;
}
@@ -265,7 +265,7 @@ public class KafkaProducer extends DefaultAsyncProducer {
Object key = endpoint.getConfiguration().getKey() != null
? endpoint.getConfiguration().getKey() : exchange.getIn().getHeader(KafkaConstants.KEY);
final Object messageKey = key != null
- ? tryConvertToSerializedType(exchange, key, endpoint.getConfiguration().getKeySerializerClass()) : null;
+ ? tryConvertToSerializedType(exchange, key, endpoint.getConfiguration().getKeySerializer()) : null;
final boolean hasMessageKey = messageKey != null;
// must convert each entry of the iterator into the value according to
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
index e293e20..b47e3bf 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
@@ -130,7 +130,7 @@ public class KafkaComponentTest extends CamelTestSupport {
assertEquals(Integer.valueOf(3), endpoint.getConfiguration().getNoOfMetricsSample());
assertEquals(Integer.valueOf(12344), endpoint.getConfiguration().getMetricsSampleWindowMs());
assertEquals(KafkaConstants.KAFKA_DEFAULT_SERIALIZER, endpoint.getConfiguration().getSerializerClass());
- assertEquals(KafkaConstants.KAFKA_DEFAULT_SERIALIZER, endpoint.getConfiguration().getKeySerializerClass());
+ assertEquals(KafkaConstants.KAFKA_DEFAULT_SERIALIZER, endpoint.getConfiguration().getKeySerializer());
assertEquals("testing", endpoint.getConfiguration().getSslKeyPassword());
assertEquals("/abc", endpoint.getConfiguration().getSslKeystoreLocation());
assertEquals("testing", endpoint.getConfiguration().getSslKeystorePassword());