(camel) 01/01: CAMEL-20094: camel-catalog: camel-spring.xsd keeps being regenerated.

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch spring-xml-regen-issue
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 173413d5cacd0faec51a3a714dcc62760502afce
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 13 10:21:39 2023 +0100

    CAMEL-20094: camel-catalog: camel-spring.xsd keeps being regenerated.
---
 .../src/main/java/org/apache/camel/tooling/util/PackageHelper.java | 7 ++++++-
 .../java/org/apache/camel/maven/EipDocumentationEnricherMojo.java  | 7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java
index 711b09e2993..1f5be498cae 100644
--- a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java
+++ b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java
@@ -24,6 +24,7 @@ import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 /**
@@ -89,8 +90,12 @@ public final class PackageHelper {
     }
 
     public static Set<File> findJsonFiles(File rootDir, Set<File> files) {
+        return findJsonFiles(rootDir, files, (f) -> true);
+    }
+
+    public static Set<File> findJsonFiles(File rootDir, Set<File> files, Predicate<File> filter) {
         try (Stream<Path> stream = findJsonFiles(rootDir.toPath())) {
-            stream.forEach(p -> files.add(p.toFile()));
+            stream.map(Path::toFile).filter(filter).forEach(files::add);
         }
         return files;
     }
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
index 5c3306fc537..b33141a5ecb 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
@@ -28,6 +28,7 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.StringJoiner;
+import java.util.function.Predicate;
 
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
@@ -168,10 +169,12 @@ public class EipDocumentationEnricherMojo extends AbstractMojo {
         Set<File> files = new HashSet<>();
         PackageHelper.findJsonFiles(new File(camelCoreModelDir, pathToModelDir), files);
         PackageHelper.findJsonFiles(new File(camelCoreXmlDir, pathToCoreXmlModelDir), files);
+        // spring/blueprint should not include SpringErrorHandlerDefinition (duplicates a file from camel-core-model)
+        Predicate<File> filter = f -> !f.getName().equals("errorHandler.json");
         if (blueprint) {
-            PackageHelper.findJsonFiles(new File(camelSpringDir, pathToSpringModelDir), files);
+            PackageHelper.findJsonFiles(new File(camelSpringDir, pathToSpringModelDir), files, filter);
         } else {
-            PackageHelper.findJsonFiles(new File(targetDir, pathToSpringModelDir), files);
+            PackageHelper.findJsonFiles(new File(targetDir, pathToSpringModelDir), files, filter);
         }
         Map<String, File> jsonFiles = new HashMap<>();
         files.forEach(f -> jsonFiles.put(PackageHelper.asName(f.toPath()), f));