You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by oa...@apache.org on 2020/12/08 10:23:24 UTC
[camel] branch master updated: Override the TLS configs (#4736)
This is an automated email from the ASF dual-hosted git repository.
oalsafi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 6d666d2 Override the TLS configs (#4736)
6d666d2 is described below
commit 6d666d2c27e024d29ae041102d003905513694cd
Author: Omar Al-Safi <om...@gmail.com>
AuthorDate: Tue Dec 8 11:23:05 2020 +0100
Override the TLS configs (#4736)
---
components/camel-vertx-kafka/camel-vertx-kafka-component/pom.xml | 2 ++
.../apache/camel/maven/component/vertx/kafka/config/ConfigField.java | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/components/camel-vertx-kafka/camel-vertx-kafka-component/pom.xml b/components/camel-vertx-kafka/camel-vertx-kafka-component/pom.xml
index f0d0004..fe5ffde 100644
--- a/components/camel-vertx-kafka/camel-vertx-kafka-component/pom.xml
+++ b/components/camel-vertx-kafka/camel-vertx-kafka-component/pom.xml
@@ -152,6 +152,8 @@
<value.serializer>org.apache.kafka.common.serialization.StringSerializer</value.serializer>
<key.deserializer>org.apache.kafka.common.serialization.StringDeserializer</key.deserializer>
<value.deserializer>org.apache.kafka.common.serialization.StringDeserializer</value.deserializer>
+ <ssl.enabled.protocols>TLSv1.2,TLSv1.3</ssl.enabled.protocols>
+ <ssl.protocol>TLSv1.2</ssl.protocol>
</overriddenDefaultValues>
<generatedSrcDir>${project.basedir}/src/generated/java</generatedSrcDir>
<parentClassName>BaseVertxKafkaConfiguration</parentClassName>
diff --git a/components/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/src/main/java/org/apache/camel/maven/component/vertx/kafka/config/ConfigField.java b/components/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/src/main/java/org/apache/camel/maven/component/vertx/kafka/config/ConfigField.java
index 1bb3ec2..f7fa752 100644
--- a/components/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/src/main/java/org/apache/camel/maven/component/vertx/kafka/config/ConfigField.java
+++ b/components/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/src/main/java/org/apache/camel/maven/component/vertx/kafka/config/ConfigField.java
@@ -283,6 +283,10 @@ public class ConfigField {
return convertValueToStringAndUnwrap(value);
}
if (type == ConfigDef.Type.LIST) {
+ // in case the value already in string joined with comma
+ if (value instanceof String) {
+ return (String) value;
+ }
return ((List<Object>) value)
.stream()
.map(this::convertValueToStringAndUnwrap)