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/23 09:48:49 UTC
[camel] 04/05: camel-jbang - 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
commit bc629b0b5b8fcb9dd1c6e1d405f4c56486dbb7b5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon May 23 11:03:50 2022 +0200
camel-jbang - Polished
---
.../main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java | 6 ------
.../java/org/apache/camel/dsl/jbang/core/commands/Build.java | 6 ------
.../org/apache/camel/dsl/jbang/core/commands/CamelCommand.java | 9 ++++++++-
.../org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java | 3 ---
.../apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java | 2 --
.../java/org/apache/camel/dsl/jbang/core/commands/Deploy.java | 2 --
.../java/org/apache/camel/dsl/jbang/core/commands/Image.java | 2 --
.../main/java/org/apache/camel/dsl/jbang/core/commands/Init.java | 5 -----
.../java/org/apache/camel/dsl/jbang/core/commands/Manifest.java | 2 --
.../java/org/apache/camel/dsl/jbang/core/commands/Package.java | 5 -----
.../main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java | 7 +------
.../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 3 ---
.../java/org/apache/camel/dsl/jbang/core/commands/UberJar.java | 7 +------
.../java/org/apache/camel/dsl/jbang/core/commands/Undeploy.java | 2 --
14 files changed, 10 insertions(+), 51 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 7a6b2d0c8c8..1542381e664 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
@@ -36,7 +36,6 @@ import org.snakeyaml.engine.v2.parser.ParserImpl;
import org.snakeyaml.engine.v2.scanner.StreamReader;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asStringSet;
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asText;
@@ -54,11 +53,6 @@ class Bind extends CamelCommand {
@CommandLine.Parameters(description = "Name of binding file", arity = "1")
private String file;
- //CHECKSTYLE:OFF
- @Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
- private boolean helpRequested = false;
- //CHECKSTYLE:ON
-
public Bind(CamelJBangMain main) {
super(main);
}
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 8738f189e6c..72ef5352212 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
@@ -18,19 +18,13 @@ package org.apache.camel.dsl.jbang.core.commands;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
@Command(name = "build", description = "Build Camel container image and resources (use --help to see sub commands)")
class Build extends CamelCommand {
- //CHECKSTYLE:OFF
- @Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
- private boolean helpRequested = false;
-
public Build(CamelJBangMain main) {
super(main);
}
- //CHECKSTYLE:ON
@Override
public Integer call() throws Exception {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
index c6888b888a9..b1568a24f18 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
@@ -18,9 +18,16 @@ package org.apache.camel.dsl.jbang.core.commands;
import java.util.concurrent.Callable;
+import picocli.CommandLine;
+
abstract class CamelCommand implements Callable<Integer> {
- CamelJBangMain main;
+ private final CamelJBangMain main;
+
+ //CHECKSTYLE:OFF
+ @CommandLine.Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
+ private boolean helpRequested = false;
+ //CHECKSTYLE:ON
public CamelCommand(CamelJBangMain main) {
this.main = main;
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 17ca4d56027..c68057a2451 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
@@ -21,9 +21,6 @@ import picocli.CommandLine;
@CommandLine.Command(name = "generate", description = "Generate source code (use --help to see sub commands)")
public class CodeGenerator extends CamelCommand {
- @CommandLine.Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
- private boolean helpRequested = true;
-
public CodeGenerator(CamelJBangMain main) {
super(main);
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
index d50b669d4d5..a32565dd3b0 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
@@ -33,8 +33,6 @@ import picocli.CommandLine;
@CommandLine.Command(name = "rest", description = "Generate REST DSL source code from OpenApi specification")
public class CodeRestGenerator extends CamelCommand {
- @CommandLine.Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
- private boolean helpRequested;
@CommandLine.Option(names = { "-i", "--input" }, required = true, description = "OpenApi specification file name")
private String input;
@CommandLine.Option(names = { "-o", "--output" }, description = "Output REST DSL file name")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Deploy.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Deploy.java
index d601a6eda7d..2efe3f03910 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Deploy.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Deploy.java
@@ -30,8 +30,6 @@ import picocli.CommandLine;
@CommandLine.Command(name = "deploy", description = "Deploy resources to Kubernetes, OpenShift, Minikube")
public class Deploy extends CamelCommand {
- @CommandLine.Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
- private boolean helpRequested;
@CommandLine.Option(names = { "--namespace" }, required = true, description = "Namespace", defaultValue = "default")
private String namespace;
@CommandLine.Option(names = { "--name" }, description = "Application name", required = true)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Image.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Image.java
index 20150493511..cf242e74497 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Image.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Image.java
@@ -46,8 +46,6 @@ public class Image extends CamelCommand {
private static final int LOG_TAIL_SIZE = 10;
- @CommandLine.Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
- private boolean helpRequested;
@CommandLine.Option(names = { "-f", "--from" }, description = "Base Image", defaultValue = "gcr.io/distroless/java:11")
private String from;
@CommandLine.Option(names = { "-j", "--jar" }, description = "Jar file", defaultValue = "camel-runner.jar")
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 792bb7d61b8..f6cacc55bab 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
@@ -47,11 +47,6 @@ class Init extends CamelCommand {
description = "When creating a yaml file should it be created as a Camel K Integration CRD")
private boolean integration;
- //CHECKSTYLE:OFF
- @Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
- private boolean helpRequested = false;
- //CHECKSTYLE:ON
-
public Init(CamelJBangMain main) {
super(main);
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Manifest.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Manifest.java
index 9f9887250c8..691bcbc30f2 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Manifest.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Manifest.java
@@ -34,8 +34,6 @@ import picocli.CommandLine;
@CommandLine.Command(name = "manifests", description = "Create Kubernetes resources")
public class Manifest extends CamelCommand {
- @CommandLine.Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
- private boolean helpRequested;
@CommandLine.Option(names = { "--path" }, description = "Output folder path", defaultValue = "manifests")
private String path;
@CommandLine.Option(names = { "--namespace" }, description = "Namespace")
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 016e821bdbf..27ed776d055 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
@@ -18,14 +18,9 @@ package org.apache.camel.dsl.jbang.core.commands;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
@Command(name = "package", description = "Package Camel application (use --help to see sub commands)")
class Package extends CamelCommand {
- //CHECKSTYLE:OFF
- @Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
- private boolean helpRequested = false;
- //CHECKSTYLE:ON
public Package(CamelJBangMain main) {
super(main);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
index de3e27e4358..7dee3095377 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
@@ -24,11 +24,6 @@ class Pipe extends CamelCommand {
@CommandLine.Parameters(description = "Name of file", arity = "1")
String file;
- //CHECKSTYLE:OFF
- @CommandLine.Option(names = {"-h", "--help"}, usageHelp = true, description = "Display the help and sub-commands")
- boolean helpRequested;
- //CHECKSTYLE:ON
-
@CommandLine.Option(names = { "--max-messages" }, defaultValue = "0",
description = "Max number of messages to process before stopping")
int maxMessages;
@@ -66,7 +61,7 @@ class Pipe extends CamelCommand {
file = file.substring(2);
}
- Run run = new Run(main);
+ Run run = new Run(getMain());
run.logging = logging;
run.loggingLevel = loggingLevel;
run.loggingColor = false;
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 a1338b54303..1e9fd5f42c7 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
@@ -89,9 +89,6 @@ class Run extends CamelCommand {
arity = "0..9")
String[] files;
- @Option(names = {"-h", "--help"}, usageHelp = true, description = "Display the help and sub-commands")
- boolean helpRequested;
-
@Option(names = {
"--dep", "--deps" }, description = "Add additional dependencies (Use commas to separate them).")
String dependencies;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
index 76b92e80b89..4785ae6b6d9 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
@@ -60,11 +60,6 @@ class UberJar extends CamelCommand {
"camel.jbang.classpathFiles"
};
- //CHECKSTYLE:OFF
- @Option(names = {"-h", "--help"}, usageHelp = true, description = "Display the help and sub-commands")
- private boolean helpRequested = false;
- //CHECKSTYLE:ON
-
@CommandLine.Option(names = { "-j", "--jar" }, defaultValue = "camel-runner.jar", description = "Jar filename")
private String jar = "camel-runner.jar";
@@ -177,7 +172,7 @@ class UberJar extends CamelCommand {
}
private Integer runSilently() throws Exception {
- Run run = new Run(main);
+ Run run = new Run(getMain());
Integer code = run.runSilent();
return code;
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Undeploy.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Undeploy.java
index f2dc038af23..d3ac9f0d902 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Undeploy.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Undeploy.java
@@ -27,8 +27,6 @@ import picocli.CommandLine;
@CommandLine.Command(name = "undeploy", description = "Undeploy resources from Kubernetes, OpenShift, Minikube")
public class Undeploy extends CamelCommand {
- @CommandLine.Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
- private boolean helpRequested;
@CommandLine.Option(names = { "--namespace" }, required = true, description = "Namespace", defaultValue = "default")
private String namespace;
@CommandLine.Option(names = { "--name" }, description = "Application name", required = true)