You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by fm...@apache.org on 2023/03/07 15:01:14 UTC
[camel] 08/08: camel-jbang - Add native column for quarkus
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2e69a49826d2a8ae1c95bd39c9f48fac207e3782
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Feb 12 16:37:10 2023 +0100
camel-jbang - Add native column for quarkus
---
.../java/org/apache/camel/dsl/jbang/core/commands/Run.java | 1 -
.../dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 12 ++++++++++++
.../dsl/jbang/core/commands/catalog/CatalogComponent.java | 3 ++-
.../dsl/jbang/core/commands/catalog/CatalogDataFormat.java | 1 +
.../camel/dsl/jbang/core/commands/catalog/CatalogDoc.java | 6 ++++--
.../dsl/jbang/core/commands/catalog/CatalogLanguage.java | 1 +
.../camel/dsl/jbang/core/commands/catalog/CatalogOther.java | 1 +
7 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index be238706898..aab691a7208 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -1066,7 +1066,6 @@ class Run extends CamelCommand {
onDownloadDependency(groupId, artifactId, version);
}
- @Override
public void onExtraRepository(String repo) {
if (!repos.contains(repo)) {
writeSettings("repository", repo);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index c2da5a87677..f3f3a9043e3 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
@@ -193,6 +193,10 @@ public abstract class CatalogBaseCommand extends CamelCommand {
}
}
+ String nativeSupported(Row r) {
+ return r.nativeSupported ? "x" : "";
+ }
+
static String fixQuarkusSince(String since) {
// quarkus-catalog may have 0.1 and 0.0.1 versions that are really 1.0
if (since != null && since.startsWith("0")) {
@@ -201,11 +205,19 @@ public abstract class CatalogBaseCommand extends CamelCommand {
return since;
}
+ static List<String> findComponentNames(CamelCatalog catalog) {
+ List<String> answer = catalog.findComponentNames();
+ // remove empty (spring boot catalog has a bug)
+ answer.removeIf(String::isBlank);
+ return answer;
+ }
+
static class Row {
String name;
String title;
String level;
String since;
+ boolean nativeSupported;
String description;
String label;
String gav;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
index 4da2893c545..0aa23f7b500 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
@@ -34,7 +34,7 @@ public class CatalogComponent extends CatalogBaseCommand {
@Override
List<CatalogBaseCommand.Row> collectRows() {
List<Row> rows = new ArrayList<>();
- for (String name : catalog.findComponentNames()) {
+ for (String name : findComponentNames(catalog)) {
ComponentModel model = catalog.componentModel(name);
Row row = new Row();
row.name = model.getScheme();
@@ -44,6 +44,7 @@ public class CatalogComponent extends CatalogBaseCommand {
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
+ row.nativeSupported = model.isNativeSupported();
row.gav = getGAV(model);
rows.add(row);
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java
index 569595cf337..5b6cc1cbc44 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java
@@ -44,6 +44,7 @@ public class CatalogDataFormat extends CatalogBaseCommand {
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
+ row.nativeSupported = model.isNativeSupported();
row.gav = getGAV(model);
rows.add(row);
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
index 2495657e01f..6b2c865a03c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
@@ -45,6 +45,8 @@ import org.apache.camel.tooling.model.OtherModel;
import org.apache.camel.util.StringHelper;
import picocli.CommandLine;
+import static org.apache.camel.dsl.jbang.core.commands.catalog.CatalogBaseCommand.findComponentNames;
+
@CommandLine.Command(name = "doc",
description = "Shows documentation for kamelet, component, and other Camel resources")
public class CatalogDoc extends CamelCommand {
@@ -172,7 +174,7 @@ public class CatalogDoc extends CamelCommand {
suggestions = SuggestSimilarHelper.didYouMean(KameletCatalogHelper.findKameletNames(kameletsVersion), name);
} else {
// assume its a component
- suggestions = SuggestSimilarHelper.didYouMean(catalog.findComponentNames(), name);
+ suggestions = SuggestSimilarHelper.didYouMean(findComponentNames(catalog), name);
}
if (suggestions != null) {
String type = kamelet ? "kamelet" : "component";
@@ -185,7 +187,7 @@ public class CatalogDoc extends CamelCommand {
if ("kamelet".equals(prefix)) {
suggestions = SuggestSimilarHelper.didYouMean(KameletCatalogHelper.findKameletNames(kameletsVersion), name);
} else if ("component".equals(prefix)) {
- suggestions = SuggestSimilarHelper.didYouMean(catalog.findComponentNames(), name);
+ suggestions = SuggestSimilarHelper.didYouMean(findComponentNames(catalog), name);
} else if ("dataformat".equals(prefix)) {
suggestions = SuggestSimilarHelper.didYouMean(catalog.findDataFormatNames(), name);
} else if ("language".equals(prefix)) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java
index b2128805c20..4c0faf51b80 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java
@@ -44,6 +44,7 @@ public class CatalogLanguage extends CatalogBaseCommand {
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
+ row.nativeSupported = model.isNativeSupported();
row.gav = getGAV(model);
rows.add(row);
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java
index 8b3b4e8a448..c874a37f253 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java
@@ -44,6 +44,7 @@ public class CatalogOther extends CatalogBaseCommand {
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
+ row.nativeSupported = model.isNativeSupported();
row.gav = getGAV(model);
rows.add(row);
}