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 2022/12/07 14:24:51 UTC
[camel-kafka-connector] branch main updated: Added exlusion of kamelets generation.
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
The following commit(s) were added to refs/heads/main by this push:
new fa3982c3e Added exlusion of kamelets generation.
fa3982c3e is described below
commit fa3982c3e6954420ff9f0d8887afd91903bfdc61
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Wed Dec 7 14:02:01 2022 +0100
Added exlusion of kamelets generation.
---
connectors/pom.xml | 3 +++
.../maven/GenerateCamelKafkaConnectorsMojo.java | 14 ++++++++++----
.../maven_project/pom.xml | 3 +++
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 839b88516..091bcd414 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -104,6 +104,9 @@
<exampleSinkPropertiesFileTemplate>${project.basedir}/camel-kafka-connector-template-example-sink-properties.template</exampleSinkPropertiesFileTemplate>
<!-- WARNING: connectors not in catalog will be removed -->
<removeMissingComponents>true</removeMissingComponents>
+ <excludedKamelets>
+ <param>ms-exchange-online-imap-oauth-source</param>
+ </excludedKamelets>
<excludedComponents>
<param>bonita</param>
<param>bean-validator</param>
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojo.java
index 275469dc6..efbe5d900 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojo.java
@@ -148,6 +148,12 @@ public class GenerateCamelKafkaConnectorsMojo extends AbstractCamelKafkaConnecto
@Parameter(defaultValue = "", readonly = true)
private List excludedComponents = Collections.EMPTY_LIST;
+ /**
+ * The Camel Kamelets Exclusion List to select for which kamelet must be skipped while generating kafka connector.
+ */
+ @Parameter(defaultValue = "", readonly = true)
+ private List excludedKamelets = Collections.EMPTY_LIST;
+
/**
* The Exclusion List of connectors that must be skipped while deleting kafka connector.
*/
@@ -187,8 +193,8 @@ public class GenerateCamelKafkaConnectorsMojo extends AbstractCamelKafkaConnecto
.collect(Collectors.joining("\n"));
KameletModel kameletModel = YamlKameletMapper.parseKameletYaml(kamelet);
- // filter all kamelets with type not in {source,sink}
- if ("source".equals(kameletModel.getType()) || "sink".equals(kameletModel.getType())) {
+ // filter all kamelets with type not in {source,sink} and not excluded
+ if (("source".equals(kameletModel.getType()) || "sink".equals(kameletModel.getType())) && !excludedKamelets.contains(kameletModel.getName())) {
kameletsResources.put(kameletModel.getName(), kamelet);
camelComponentsUsedInKamelets.addAll(
kameletModel.getDependencies().stream()
@@ -197,9 +203,9 @@ public class GenerateCamelKafkaConnectorsMojo extends AbstractCamelKafkaConnecto
.collect(Collectors.toSet())
);
}
- //TODO: add include (filter) / exclude mechanism
- getLog().info("Kamelets found to be used to generate/update a kafka connector: " + kameletsResources.keySet());
+ //TODO: add include (filter)
}
+ getLog().info("Kamelets found to be used to generate/update a kafka connector: " + kameletsResources.keySet());
for (String kamelet : kameletsResources.keySet()) {
executeMojo(
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml
index a3816c1bf..e67cf7350 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml
@@ -115,6 +115,9 @@
${project.build.testOutputDirectory}/camel-kafka-connector-template-example-sink-properties.template
</exampleSinkPropertiesFileTemplate>
<removeMissingComponents>true</removeMissingComponents>
+ <excludedKamelets>
+ <param>ms-exchange-online-imap-oauth-source</param>
+ </excludedKamelets>
<excludedComponents>
<param>bonita</param>
<param>bean-validator</param>