You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/05/14 07:19:26 UTC
[camel] branch main updated: Polished
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
The following commit(s) were added to refs/heads/main by this push:
new b85fed504c8 Polished
b85fed504c8 is described below
commit b85fed504c8ca9ca0360e6198f62a1582f0b6deb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat May 14 09:19:04 2022 +0200
Polished
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java | 2 +-
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java | 2 +-
.../java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 4 +++-
.../java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java | 2 +-
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java | 2 +-
.../main/java/org/apache/camel/dsl/jbang/core/commands/Package.java | 2 +-
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
7 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
index e969d3122cb..eb0df0d8641 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
@@ -43,7 +43,7 @@ import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asStringS
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asText;
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.nodeAt;
-@Command(name = "bind", description = "Bind Kubernetes resources, such as Kamelets, in an integration flow")
+@Command(name = "bind", description = "Bind source and sink Kamelets as a new Camel integration")
class Bind implements Callable<Integer> {
@CommandLine.Parameters(description = "Source such as a Kamelet or Camel endpoint uri", arity = "1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java
index 2e3aa1669e1..0385a73c9f7 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java
@@ -22,7 +22,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-@Command(name = "build", description = "Build Camel container image and resources (use --help)")
+@Command(name = "build", description = "Build Camel container image and resources")
class Build implements Callable<Integer> {
//CHECKSTYLE:OFF
@Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
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 47d3ad10bdb..774c38f2591 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
@@ -43,7 +43,8 @@ public class CamelJBangMain implements Callable<Integer> {
.addSubcommand("manifests", new Manifest())
.addSubcommand("image", new Image()))
.addSubcommand("deploy", new CommandLine(new Deploy()))
- .addSubcommand("undeploy", new CommandLine(new Undeploy()))
+ .addSubcommand("undeploy", new CommandLine(new Undeploy()));
+/* // TODO: do not show commands that are deprecated and to be either removed or reworked
.addSubcommand("search", new CommandLine(new Search())
.addSubcommand("kamelets", new SearchKamelets())
.addSubcommand("components", new SearchComponents())
@@ -51,6 +52,7 @@ public class CamelJBangMain implements Callable<Integer> {
.addSubcommand("others", new SearchOthers()))
.addSubcommand("create", new CommandLine(new Create())
.addSubcommand("project", new Project()));
+*/
commandLine.getCommandSpec().versionProvider(() -> {
CamelCatalog catalog = new DefaultCamelCatalog();
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java
index f7a7e715c53..7ce03afb3f4 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java
@@ -20,7 +20,7 @@ import java.util.concurrent.Callable;
import picocli.CommandLine;
-@CommandLine.Command(name = "generate", description = "Generate source code")
+@CommandLine.Command(name = "generate", description = "Generate source code (use --help to see sub commands)")
public class CodeGenerator implements Callable<Integer> {
@CommandLine.Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index 11d3d1a487f..b2da2b4cbc1 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
@@ -38,7 +38,7 @@ import static org.apache.camel.dsl.jbang.core.commands.GistHelper.fetchGistUrls;
import static org.apache.camel.dsl.jbang.core.commands.GitHubHelper.asGithubSingleUrl;
import static org.apache.camel.dsl.jbang.core.commands.GitHubHelper.fetchGithubUrls;
-@Command(name = "init", description = "Initialize empty Camel integrations")
+@Command(name = "init", description = "Initialize empty Camel integration")
class Init implements Callable<Integer> {
@CommandLine.Parameters(description = "Name of integration file", arity = "1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Package.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Package.java
index 82f63be3c43..76f31f318aa 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Package.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Package.java
@@ -22,7 +22,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-@Command(name = "package", description = "Package Camel application (use --help)")
+@Command(name = "package", description = "Package Camel application")
class Package implements Callable<Integer> {
//CHECKSTYLE:OFF
@Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
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 fe3cd40068f..4355f68f809 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
@@ -67,7 +67,7 @@ import static org.apache.camel.dsl.jbang.core.commands.GistHelper.fetchGistUrls;
import static org.apache.camel.dsl.jbang.core.commands.GitHubHelper.asGithubSingleUrl;
import static org.apache.camel.dsl.jbang.core.commands.GitHubHelper.fetchGithubUrls;
-@Command(name = "run", description = "Run Camel")
+@Command(name = "run", description = "Run as local Camel application")
class Run implements Callable<Integer> {
public static final String WORK_DIR = ".camel-jbang";