This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit bdb3d8563dedd2219906ee5c427bb62cb870f9a8 Author: Peter Palaga <[email protected]> AuthorDate: Fri Feb 11 17:06:58 2022 +0100 Honor extension deprecation in Catalog and in documentation --- .../org/apache/camel/quarkus/maven/CamelQuarkusExtension.java | 9 +++++++++ .../src/main/java/org/apache/camel/quarkus/maven/CqUtils.java | 4 ++-- .../apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java | 2 +- .../apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java index c6999ca..785c301 100644 --- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java +++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java @@ -75,6 +75,7 @@ public class CamelQuarkusExtension { : ExtensionStatus.valueOf(extensionStatus); final boolean unlisted = !nativeSupported || Boolean.parseBoolean(props.getProperty("quarkus.metadata.unlisted", "false")); + final boolean deprecated = Boolean.parseBoolean(props.getProperty("quarkus.metadata.deprecated", "false")); final String rawKind = (String) props.get(CAMEL_QUARKUS_KIND); final Kind kind = rawKind == null ? null : Kind.valueOf(rawKind); @@ -92,6 +93,7 @@ public class CamelQuarkusExtension { nativeSupported, status, unlisted, + deprecated, deps == null ? Collections.emptyList() : Collections.unmodifiableList(deps), kind, props.getProperty("cq.quarkus.aws.client.baseName"), @@ -114,6 +116,7 @@ public class CamelQuarkusExtension { private final List<Dependency> dependencies; private final ExtensionStatus status; private final boolean unlisted; + private final boolean deprecated; private final Kind kind; private final String quarkusAwsClientBaseName; private final String quarkusAwsClientFqClassName; @@ -131,6 +134,7 @@ public class CamelQuarkusExtension { boolean nativeSupported, ExtensionStatus status, boolean unlisted, + boolean deprecated, List<Dependency> dependencies, Kind kind, String quarkusAwsClientBaseName, @@ -148,6 +152,7 @@ public class CamelQuarkusExtension { this.nativeSupported = nativeSupported; this.status = status; this.unlisted = unlisted; + this.deprecated = deprecated; this.dependencies = dependencies; this.kind = kind; this.quarkusAwsClientBaseName = quarkusAwsClientBaseName; @@ -210,6 +215,10 @@ public class CamelQuarkusExtension { return unlisted; } + public boolean isDeprecated() { + return deprecated; + } + public Kind getKind() { return kind; } diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java index b22e83d..da3c906 100644 --- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java +++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java @@ -229,8 +229,8 @@ public class CqUtils { } } - public static boolean isDeprecated(String title, Collection<ArtifactModel<?>> models) { - return title.contains("(deprecated)") || models.stream().anyMatch(m -> m.isDeprecated()); + public static boolean isDeprecated(String title, Collection<ArtifactModel<?>> models, boolean deprecated) { + return deprecated || title.contains("(deprecated)") || models.stream().anyMatch(m -> m.isDeprecated()); } static Path copyJar(Path localRepository, String groupId, String artifactId, String version) { diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java index 936989b..5e2fc00 100644 --- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java +++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java @@ -133,7 +133,7 @@ public class PrepareCatalogQuarkusMojo extends AbstractExtensionListMojo { model.setTitle(title); model.setDescription(ext.getDescription().orElseThrow(() -> new RuntimeException( "description is missing in " + ext.getRuntimePomXmlPath()))); - model.setDeprecated(CqUtils.isDeprecated(title, models)); + model.setDeprecated(CqUtils.isDeprecated(title, models, ext.isDeprecated())); model.setLabel(ext.getLabel().orElse("quarkus")); update(model, ext, nativeSupported); CqCatalog.serialize(catalogPath, model); 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 029d823..aecfe89 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 @@ -115,7 +115,7 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { final String description = CqUtils.getDescription(models, ext.getDescription().orElse(null), getLog()); model.put("description", description); model.put("status", ext.getStatus().getCapitalized()); - final boolean deprecated = CqUtils.isDeprecated(title, models); + final boolean deprecated = CqUtils.isDeprecated(title, models, ext.isDeprecated()); model.put("statusDeprecation", deprecated ? ext.getStatus().getCapitalized() + " Deprecated" : ext.getStatus().getCapitalized()); model.put("deprecated", deprecated);
