This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2a4f106c8503c527d6a833279773baa5857bf6dd
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Sep 17 10:26:11 2022 +0200
CAMEL-18515: camel-jbang - Command to list more from the catalog.
---
.../camel/dsl/jbang/core/commands/CamelJBangMain.java | 6 ++++++
.../jbang/core/commands/catalog/CatalogComponent.java | 2 +-
.../{CatalogComponent.java => CatalogDataFormat.java} | 16 ++++++++--------
.../{CatalogComponent.java => CatalogLanguage.java} | 16 ++++++++--------
.../catalog/{CatalogComponent.java => CatalogOther.java} | 16 ++++++++--------
5 files changed, 31 insertions(+), 25 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index 281aa9b330e..e188dbd6781 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -30,7 +30,10 @@ import
org.apache.camel.dsl.jbang.core.commands.action.CamelSourceTop;
import org.apache.camel.dsl.jbang.core.commands.action.CamelThreadDump;
import org.apache.camel.dsl.jbang.core.commands.catalog.CatalogCommand;
import org.apache.camel.dsl.jbang.core.commands.catalog.CatalogComponent;
+import org.apache.camel.dsl.jbang.core.commands.catalog.CatalogDataFormat;
import org.apache.camel.dsl.jbang.core.commands.catalog.CatalogKamelet;
+import org.apache.camel.dsl.jbang.core.commands.catalog.CatalogLanguage;
+import org.apache.camel.dsl.jbang.core.commands.catalog.CatalogOther;
import org.apache.camel.dsl.jbang.core.commands.process.CamelContextStatus;
import org.apache.camel.dsl.jbang.core.commands.process.CamelContextTop;
import org.apache.camel.dsl.jbang.core.commands.process.CamelProcessorStatus;
@@ -79,6 +82,9 @@ public class CamelJBangMain implements Callable<Integer> {
.addSubcommand("rest", new CommandLine(new
CodeRestGenerator(main))))
.addSubcommand("catalog", new CommandLine(new
CatalogCommand(main))
.addSubcommand("component", new CommandLine(new
CatalogComponent(main)))
+ .addSubcommand("dataformat", new CommandLine(new
CatalogDataFormat(main)))
+ .addSubcommand("language", new CommandLine(new
CatalogLanguage(main)))
+ .addSubcommand("other", new CommandLine(new
CatalogOther(main)))
.addSubcommand("kamelet", new CommandLine(new
CatalogKamelet(main))))
.addSubcommand("jolokia", new CommandLine(new Jolokia(main)))
.addSubcommand("hawtio", new CommandLine(new Hawtio(main)))
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 44ca415a726..9974d19d739 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
@@ -24,7 +24,7 @@ import org.apache.camel.tooling.model.ComponentModel;
import picocli.CommandLine;
@CommandLine.Command(name = "component", aliases = { "component", "components"
},
- description = "List Component from the Camel Catalog")
+ description = "List components from the Camel Catalog")
public class CatalogComponent extends CatalogBaseCommand {
public CatalogComponent(CamelJBangMain main) {
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/CatalogDataFormat.java
similarity index 74%
copy from
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
copy to
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java
index 44ca415a726..43534150bac 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/CatalogDataFormat.java
@@ -20,22 +20,22 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
-import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.model.DataFormatModel;
import picocli.CommandLine;
-@CommandLine.Command(name = "component", aliases = { "component", "components"
},
- description = "List Component from the Camel Catalog")
-public class CatalogComponent extends CatalogBaseCommand {
+@CommandLine.Command(name = "dataformat", aliases = { "dataformat",
"dataformats" },
+ description = "List data formats from the Camel Catalog")
+public class CatalogDataFormat extends CatalogBaseCommand {
- public CatalogComponent(CamelJBangMain main) {
+ public CatalogDataFormat(CamelJBangMain main) {
super(main);
}
@Override
- List<CatalogBaseCommand.Row> collectRows() {
+ List<Row> collectRows() {
List<Row> rows = new ArrayList<>();
- for (String name : catalog.findComponentNames()) {
- ComponentModel model = catalog.componentModel(name);
+ for (String name : catalog.findDataFormatNames()) {
+ DataFormatModel model = catalog.dataFormatModel(name);
Row row = new Row();
row.name = model.getName();
row.level = model.getSupportLevel().name();
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/CatalogLanguage.java
similarity index 74%
copy from
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
copy to
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java
index 44ca415a726..a84045201ea 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/CatalogLanguage.java
@@ -20,22 +20,22 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
-import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.model.LanguageModel;
import picocli.CommandLine;
-@CommandLine.Command(name = "component", aliases = { "component", "components"
},
- description = "List Component from the Camel Catalog")
-public class CatalogComponent extends CatalogBaseCommand {
+@CommandLine.Command(name = "language", aliases = { "language", "languages" },
+ description = "List expression languages from the Camel
Catalog")
+public class CatalogLanguage extends CatalogBaseCommand {
- public CatalogComponent(CamelJBangMain main) {
+ public CatalogLanguage(CamelJBangMain main) {
super(main);
}
@Override
- List<CatalogBaseCommand.Row> collectRows() {
+ List<Row> collectRows() {
List<Row> rows = new ArrayList<>();
- for (String name : catalog.findComponentNames()) {
- ComponentModel model = catalog.componentModel(name);
+ for (String name : catalog.findLanguageNames()) {
+ LanguageModel model = catalog.languageModel(name);
Row row = new Row();
row.name = model.getName();
row.level = model.getSupportLevel().name();
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/CatalogOther.java
similarity index 74%
copy from
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
copy to
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java
index 44ca415a726..c643739eeef 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/CatalogOther.java
@@ -20,22 +20,22 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
-import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.model.OtherModel;
import picocli.CommandLine;
-@CommandLine.Command(name = "component", aliases = { "component", "components"
},
- description = "List Component from the Camel Catalog")
-public class CatalogComponent extends CatalogBaseCommand {
+@CommandLine.Command(name = "other", aliases = { "other", "others" },
+ description = "List miscellaneous components from the
Camel Catalog")
+public class CatalogOther extends CatalogBaseCommand {
- public CatalogComponent(CamelJBangMain main) {
+ public CatalogOther(CamelJBangMain main) {
super(main);
}
@Override
- List<CatalogBaseCommand.Row> collectRows() {
+ List<Row> collectRows() {
List<Row> rows = new ArrayList<>();
- for (String name : catalog.findComponentNames()) {
- ComponentModel model = catalog.componentModel(name);
+ for (String name : catalog.findOtherNames()) {
+ OtherModel model = catalog.otherModel(name);
Row row = new Row();
row.name = model.getName();
row.level = model.getSupportLevel().name();
