You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by va...@apache.org on 2024/10/29 16:02:13 UTC
(camel-kafka-connector) 01/02: Added the handling of https://github.com/apache/camel-kamelets/issues/2260 corner case in connectors generated by kamelets
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 54c313171aaa9d00dd3e9f8367e824765d4aa9d0
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Oct 29 11:10:19 2024 +0100
Added the handling of https://github.com/apache/camel-kamelets/issues/2260 corner case in connectors generated by kamelets
---
.../kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java | 7 +++++--
.../apache/camel/kafkaconnector/maven/utils/YamlKameletMapper.java | 6 +++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java
index 18da9d7e62..891c1f0eaa 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java
@@ -253,13 +253,16 @@ public class CamelKafkaConnectorKameletUpdateMojo extends AbstractCamelKameletKa
private Set<String> getKameletDependencies(KameletModel kamelet) throws XPathExpressionException {
Set<String> deps = new HashSet<>(kamelet.getDependencies());
- Set<String> gavDeps = deps.stream().map(stringDep -> {
+ Set<String> gavDeps = deps.stream()
+ .filter(stringDep -> stringDep != null && !stringDep.trim().isEmpty() && !"null".equals(stringDep.trim()))
+ .map(stringDep -> {
if (stringDep.startsWith("mvn:")) {
return stringDep.replaceFirst("mvn:", "");
} else if (stringDep.startsWith("camel:")) {
return getMainDepGroupId() + ":" + stringDep.replaceFirst(":", "-");
} else {
- getLog().warn("Dependency " + stringDep + "is used as is. Might not be the intended behaviour!");
+ String length = stringDep == null ? "the string is null value" : Integer.toString(stringDep.length());
+ getLog().warn("Dependency string: " + stringDep + " (length of the string is: " + length + ") is used as is. Might not be the intended behaviour!");
return stringDep;
}
}).collect(Collectors.toSet());
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/YamlKameletMapper.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/YamlKameletMapper.java
index 6cae0513a0..5f21226270 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/YamlKameletMapper.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/YamlKameletMapper.java
@@ -65,7 +65,11 @@ public final class YamlKameletMapper {
km.setRequiredProperties(requiredProperties);
Set<String> dependencies = new HashSet<>();
- kameletYamlNode.at("/spec/dependencies").forEach(req -> dependencies.add(req.asText()));
+ kameletYamlNode.at("/spec/dependencies").forEach(req -> {
+ if (req != null && !req.isNull()) {
+ dependencies.add(req.asText());
+ }
+ });
km.setDependencies(dependencies);
List<KameletPropertyModel> kpms = new ArrayList<>();