This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 1dbb69b7b8 Adjust UpdateExtensionDocPageMojo to filter on supported
catalog model kinds
1dbb69b7b8 is described below
commit 1dbb69b7b897ab0d7e3a7bdb0011b7e2a413c380
Author: James Netherton <[email protected]>
AuthorDate: Wed Apr 3 14:03:29 2024 +0100
Adjust UpdateExtensionDocPageMojo to filter on supported catalog model kinds
---
.../camel/quarkus/maven/UpdateExtensionDocPageMojo.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
index 62f58e6be5..8218464e8e 100644
---
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
+++
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
@@ -31,6 +31,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -54,9 +55,7 @@ import
org.apache.camel.quarkus.maven.processor.SectionIdPostProcessor;
import org.apache.camel.tooling.model.ArtifactModel;
import org.apache.camel.tooling.model.BaseModel;
import org.apache.camel.tooling.model.ComponentModel;
-import org.apache.camel.tooling.model.DevConsoleModel;
import org.apache.camel.tooling.model.Kind;
-import org.apache.camel.tooling.model.TransformerModel;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -71,6 +70,13 @@ public class UpdateExtensionDocPageMojo extends
AbstractDocGeneratorMojo {
new AppendNewLinePostProcessor(),
new SectionIdPostProcessor()
};
+ static final Predicate<ArtifactModel<?>> SUPPORTED_MODEL_KIND_FILTER =
artifactModel -> {
+ Kind kind = artifactModel.getKind();
+ return kind.equals(Kind.component) ||
+ kind.equals(Kind.dataformat) ||
+ kind.equals(Kind.language) ||
+ kind.equals(Kind.other);
+ };
@Parameter(defaultValue = "false", property =
"camel-quarkus.update-extension-doc-page.skip")
boolean skip = false;
@@ -113,8 +119,7 @@ public class UpdateExtensionDocPageMojo extends
AbstractDocGeneratorMojo {
templatesUriBase, encoding);
final List<ArtifactModel<?>> models =
catalog.filterModels(ext.getRuntimeArtifactIdBase())
- .filter(artifactModel -> !(artifactModel instanceof
DevConsoleModel))
- .filter(artifactModel -> !(artifactModel instanceof
TransformerModel))
+ .filter(SUPPORTED_MODEL_KIND_FILTER)
.filter(artifactModel ->
!artifactModel.getArtifactId().equals("camel-management"))
.filter(artifactModel ->
!artifactModel.getArtifactId().equals("camel-yaml-io"))
.sorted(BaseModel.compareTitle())