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 fd25e49 GenerateCamelKafkaConnectorsMojo : Added possibility to
exclude connectors from automatic deletion during generation.
fd25e49 is described below
commit fd25e49824f5798ff1a2570a37a0e8d3246a2556
Author: Andrea Tarocchi <[email protected]>
AuthorDate: Sun Oct 31 01:22:26 2021 +0200
GenerateCamelKafkaConnectorsMojo : Added possibility to exclude connectors
from automatic deletion during generation.
---
.../maven/GenerateCamelKafkaConnectorsMojo.java | 16 ++++++++++++----
.../maven_project/pom.xml | 3 +++
2 files changed, 15 insertions(+), 4 deletions(-)
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 aff55e1..275469d 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 Exclusion List of connectors that must be skipped while deleting
kafka connector.
+ */
+ @Parameter(defaultValue = "", readonly = true)
+ private List excludedConnectorsFromDeletion = Collections.EMPTY_LIST;
+
@Component
private ProjectDependenciesResolver projectDependenciesResolver;
@@ -335,13 +341,15 @@ public class GenerateCamelKafkaConnectorsMojo extends
AbstractCamelKafkaConnecto
if (existingConnectorNames != null) {
List<String> connectorsToRemove =
Stream.of(existingConnectorNames).sorted().filter(filename -> {
String componentName = extractComponentName(filename);
- // set to remove connectors that are not generated
from camel components or a kamelet
- return
!sanitizedGeneratedFromComponentsConnectorsNames.contains(componentName) &&
!sanitizedGeneratedFromKameletsConnectorsNames.contains(componentName);
+ // set to remove connectors that are not generated
from camel components or a kamelet and are not excluded in
excludedConnectorsFromDeletion
+ return
!sanitizedGeneratedFromComponentsConnectorsNames.contains(componentName)
+ &&
!sanitizedGeneratedFromKameletsConnectorsNames.contains(componentName)
+ &&
!excludedConnectorsFromDeletion.contains(componentName);
}).collect(Collectors.toList());
getLog().info("Connectors previously generated found to be
removed: " + connectorsToRemove);
- for (String component: connectorsToRemove) {
+ for (String connectorToBeRemoved: connectorsToRemove) {
executeMojo(
plugin(
@@ -351,7 +359,7 @@ public class GenerateCamelKafkaConnectorsMojo extends
AbstractCamelKafkaConnecto
),
goal("camel-kafka-connector-delete"),
configuration(
- element(name("name"), component),
+ element(name("name"),
connectorToBeRemoved),
element(name("connectorsProjectName"),
connectorsProjectName)
),
executionEnvironment(
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 7ac1eaa..a3816c1 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
@@ -131,6 +131,9 @@
<param>ref</param>
<param>robotframework</param>
</excludedComponents>
+ <excludedConnectorsFromDeletion>
+ <param>test</param>
+ </excludedConnectorsFromDeletion>
</configuration>
<executions>
<execution>