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 2d219db0101d3f50b09ea7747e6403da50c7255f Author: Claus Ibsen <[email protected]> AuthorDate: Wed Jan 4 13:39:12 2023 +0100 CAMEL-18523: camel-jbang - Add watch option --- .../org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 4 ++-- .../dsl/jbang/core/commands/process/CamelContextStatus.java | 4 ++-- .../camel/dsl/jbang/core/commands/process/CamelContextTop.java | 4 ++-- .../apache/camel/dsl/jbang/core/commands/process/CamelCount.java | 4 ++-- .../dsl/jbang/core/commands/process/CamelProcessorStatus.java | 4 ++-- .../camel/dsl/jbang/core/commands/process/CamelRouteStatus.java | 4 ++-- .../camel/dsl/jbang/core/commands/process/CamelStatus.java | 9 +++++++-- .../apache/camel/dsl/jbang/core/commands/process/CamelTop.java | 9 +++++++-- .../camel/dsl/jbang/core/commands/process/ListBlocked.java | 4 ++-- .../dsl/jbang/core/commands/process/ListCircuitBreaker.java | 4 ++-- .../process/{CamelEndpointStatus.java => ListEndpoint.java} | 6 +++--- .../apache/camel/dsl/jbang/core/commands/process/ListEvent.java | 4 ++-- .../apache/camel/dsl/jbang/core/commands/process/ListHealth.java | 4 ++-- .../camel/dsl/jbang/core/commands/process/ListInflight.java | 4 ++-- .../apache/camel/dsl/jbang/core/commands/process/ListMetric.java | 4 ++-- .../camel/dsl/jbang/core/commands/process/ListProcess.java | 2 +- .../camel/dsl/jbang/core/commands/process/ListService.java | 4 ++-- .../apache/camel/dsl/jbang/core/commands/process/ListVault.java | 4 ++-- .../{WatchableProcessCommand.java => ProcessWatchCommand.java} | 4 ++-- 19 files changed, 48 insertions(+), 38 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 9c487c6800c..d35972a8fe7 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 @@ -41,7 +41,6 @@ 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.CamelCount; -import org.apache.camel.dsl.jbang.core.commands.process.CamelEndpointStatus; import org.apache.camel.dsl.jbang.core.commands.process.CamelProcessorStatus; import org.apache.camel.dsl.jbang.core.commands.process.CamelProcessorTop; import org.apache.camel.dsl.jbang.core.commands.process.CamelRouteStatus; @@ -52,6 +51,7 @@ import org.apache.camel.dsl.jbang.core.commands.process.Hawtio; import org.apache.camel.dsl.jbang.core.commands.process.Jolokia; import org.apache.camel.dsl.jbang.core.commands.process.ListBlocked; import org.apache.camel.dsl.jbang.core.commands.process.ListCircuitBreaker; +import org.apache.camel.dsl.jbang.core.commands.process.ListEndpoint; import org.apache.camel.dsl.jbang.core.commands.process.ListEvent; import org.apache.camel.dsl.jbang.core.commands.process.ListHealth; import org.apache.camel.dsl.jbang.core.commands.process.ListInflight; @@ -80,7 +80,7 @@ public class CamelJBangMain implements Callable<Integer> { .addSubcommand("processor", new CommandLine(new CamelProcessorStatus(main))) .addSubcommand("count", new CommandLine(new CamelCount(main))) .addSubcommand("health", new CommandLine(new ListHealth(main))) - .addSubcommand("endpoint", new CommandLine(new CamelEndpointStatus(main))) + .addSubcommand("endpoint", new CommandLine(new ListEndpoint(main))) .addSubcommand("event", new CommandLine(new ListEvent(main))) .addSubcommand("inflight", new CommandLine(new ListInflight(main))) .addSubcommand("blocked", new CommandLine(new ListBlocked(main))) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java index 1a331516dba..eb87dc1f2fb 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Command; @Command(name = "context", description = "Get status of Camel integrations") -public class CamelContextStatus extends ProcessBaseCommand { +public class CamelContextStatus extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -49,7 +49,7 @@ public class CamelContextStatus extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids(name); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java index 9cdbcc8c334..ed36eb58b8e 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Command; @Command(name = "context", description = "Top status of Camel integrations") -public class CamelContextTop extends ProcessBaseCommand { +public class CamelContextTop extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -48,7 +48,7 @@ public class CamelContextTop extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids(name); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java index 69515307887..f43d3f6819c 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Command; @Command(name = "count", description = "Get total and failed exchanges for running integrations") -public class CamelCount extends ProcessBaseCommand { +public class CamelCount extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -56,7 +56,7 @@ public class CamelCount extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids(name); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java index 39a30060c69..f752d71da1d 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java @@ -35,7 +35,7 @@ import picocli.CommandLine; import picocli.CommandLine.Command; @Command(name = "processor", description = "Get status of Camel processors") -public class CamelProcessorStatus extends ProcessBaseCommand { +public class CamelProcessorStatus extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -61,7 +61,7 @@ public class CamelProcessorStatus extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids(name); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java index f5cb0545a34..2e65d9ec7a3 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java @@ -34,7 +34,7 @@ import picocli.CommandLine; import picocli.CommandLine.Command; @Command(name = "route", description = "Get status of Camel routes") -public class CamelRouteStatus extends ProcessBaseCommand { +public class CamelRouteStatus extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -64,7 +64,7 @@ public class CamelRouteStatus extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids(name); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java index 3f3c44df414..26c9e8eb22c 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java @@ -24,6 +24,10 @@ import picocli.CommandLine; description = "Get status of Camel integrations (use get --help to see sub commands)") public class CamelStatus extends CamelCommand { + @CommandLine.Option(names = { "--watch" }, + description = "Execute periodically and showing output fullscreen") + boolean watch; + public CamelStatus(CamelJBangMain main) { super(main); } @@ -31,7 +35,8 @@ public class CamelStatus extends CamelCommand { @Override public Integer call() throws Exception { // default to get the integrations - new CommandLine(new CamelContextStatus(getMain())).execute(); - return 0; + CamelContextStatus cmd = new CamelContextStatus(getMain()); + cmd.watch = watch; + return new CommandLine(cmd).execute(); } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java index 9f0b3b8c1a0..6a5fc9c0983 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java @@ -24,6 +24,10 @@ import picocli.CommandLine; description = "Top status of Camel integrations (use top --help to see sub commands)") public class CamelTop extends CamelCommand { + @CommandLine.Option(names = { "--watch" }, + description = "Execute periodically and showing output fullscreen") + boolean watch; + public CamelTop(CamelJBangMain main) { super(main); } @@ -31,7 +35,8 @@ public class CamelTop extends CamelCommand { @Override public Integer call() throws Exception { // default to top the integrations - new CommandLine(new CamelContextTop(getMain())).execute(); - return 0; + CamelContextTop cmd = new CamelContextTop(getMain()); + cmd.watch = watch; + return new CommandLine(cmd).execute(); } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java index 5cc8ac73359..800eba36ca3 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Command; @Command(name = "blocked", description = "Get blocked messages of Camel integrations") -public class ListBlocked extends ProcessBaseCommand { +public class ListBlocked extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -48,7 +48,7 @@ public class ListBlocked extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids(name); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java index d91051babaa..9d79ed9568e 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Command; @Command(name = "circuit-breaker", description = "Get status of Circuit Breaker EIPs") -public class ListCircuitBreaker extends ProcessBaseCommand { +public class ListCircuitBreaker extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -48,7 +48,7 @@ public class ListCircuitBreaker extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids(name); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelEndpointStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEndpoint.java similarity index 98% rename from dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelEndpointStatus.java rename to dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEndpoint.java index 53d2c44192f..e3205346c86 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelEndpointStatus.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEndpoint.java @@ -34,7 +34,7 @@ import picocli.CommandLine; import picocli.CommandLine.Command; @Command(name = "endpoint", description = "Get usage of Camel endpoints") -public class CamelEndpointStatus extends ProcessBaseCommand { +public class ListEndpoint extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -63,12 +63,12 @@ public class CamelEndpointStatus extends ProcessBaseCommand { description = "List endpoint URI without query parameters (short)") boolean shortUri; - public CamelEndpointStatus(CamelJBangMain main) { + public ListEndpoint(CamelJBangMain main) { super(main); } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); // make it easier to filter diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java index 9f201aecc24..fca78be3c4a 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Command; @Command(name = "event", description = "Get latest events of Camel integrations") -public class ListEvent extends ProcessBaseCommand { +public class ListEvent extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -52,7 +52,7 @@ public class ListEvent extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids(name); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java index 5ba23909a2a..8d69917ba7b 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java @@ -40,7 +40,7 @@ import picocli.CommandLine; import picocli.CommandLine.Command; @Command(name = "health", description = "Get health check status of running Camel integrations") -public class ListHealth extends ProcessBaseCommand { +public class ListHealth extends ProcessWatchCommand { @CommandLine.Option(names = { "--sort" }, description = "Sort by pid, name or age", defaultValue = "pid") @@ -75,7 +75,7 @@ public class ListHealth extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { final List<Row> rows = new ArrayList<>(); // include stack-traces diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java index ce0ae54e0c5..941431dce9e 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Command; @Command(name = "inflight", description = "Get inflight messages of Camel integrations") -public class ListInflight extends ProcessBaseCommand { +public class ListInflight extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -48,7 +48,7 @@ public class ListInflight extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids(name); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java index b4252053865..b69b646b1d9 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Command; @Command(name = "metric", description = "Get metrics (micrometer) of running Camel integrations") -public class ListMetric extends ProcessBaseCommand { +public class ListMetric extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -60,7 +60,7 @@ public class ListMetric extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids(name); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java index 3dbc775570b..8d67cfff03b 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java @@ -32,7 +32,7 @@ import picocli.CommandLine; import picocli.CommandLine.Command; @Command(name = "ps", description = "List running Camel integrations") -public class ListProcess extends WatchableProcessCommand { +public class ListProcess extends ProcessWatchCommand { @CommandLine.Option(names = { "--sort" }, description = "Sort by pid, name or age", defaultValue = "pid") diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java index 3a45113de8b..9b56a84ef15 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Command; @Command(name = "service", description = "Get services of Camel integrations") -public class ListService extends ProcessBaseCommand { +public class ListService extends ProcessWatchCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name = "*"; @@ -48,7 +48,7 @@ public class ListService extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids(name); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java index d6092254a00..8ce83a353cb 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Command; @Command(name = "vault", description = "List secrets from security vaults used by running Camel integrations") -public class ListVault extends ProcessBaseCommand { +public class ListVault extends ProcessWatchCommand { @CommandLine.Option(names = { "--sort" }, description = "Sort by pid, name", defaultValue = "pid") @@ -45,7 +45,7 @@ public class ListVault extends ProcessBaseCommand { } @Override - public Integer call() throws Exception { + public Integer doCall() throws Exception { List<Row> rows = new ArrayList<>(); List<Long> pids = findPids("*"); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/WatchableProcessCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessWatchCommand.java similarity index 93% rename from dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/WatchableProcessCommand.java rename to dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessWatchCommand.java index f01131efea4..09489d30f9e 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/WatchableProcessCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessWatchCommand.java @@ -24,13 +24,13 @@ import picocli.CommandLine; /** * Base class for commands that can run in watch mode. */ -public abstract class WatchableProcessCommand extends ProcessBaseCommand { +abstract class ProcessWatchCommand extends ProcessBaseCommand { @CommandLine.Option(names = { "--watch" }, description = "Execute periodically and showing output fullscreen") boolean watch; - public WatchableProcessCommand(CamelJBangMain main) { + public ProcessWatchCommand(CamelJBangMain main) { super(main); }
