This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch CAMEL-19982/camel-jbang-jvm-debug-as-last-parameter in repository https://gitbox.apache.org/repos/asf/camel.git
commit e1f6c21450c316c012f6496b7c14e9005b67c99e Author: Nicolas Filotto <[email protected]> AuthorDate: Thu Oct 12 19:45:24 2023 +0200 CAMEL-19982: camel-jbang - Allow --jvm-debug as last parameter --- .../org/apache/camel/dsl/jbang/core/commands/CamelCommand.java | 6 +++++- .../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) 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 66fc65bfb71..d520060113b 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 @@ -144,7 +144,7 @@ public abstract class CamelCommand implements Callable<Integer> { @Override public void consumeParameters(Stack<String> args, ArgSpec argSpec, CommandSpec cmdSpec) { - if (args.isEmpty()) { + if (failIfEmptyArgs() && args.isEmpty()) { throw new ParameterException(cmdSpec.commandLine(), "Error: missing required parameter"); } T cmd = (T) cmdSpec.userObject(); @@ -152,6 +152,10 @@ public abstract class CamelCommand implements Callable<Integer> { } protected abstract void doConsumeParameters(Stack<String> args, T cmd); + + protected boolean failIfEmptyArgs() { + return true; + } } } 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 1af68230338..3c718fe5eca 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 @@ -1249,7 +1249,7 @@ public class Run extends CamelCommand { if (f.exists() && f.isDirectory()) { return true; } - + if (FileUtil.onlyExt(name) == null) { return true; } @@ -1411,7 +1411,7 @@ public class Run extends CamelCommand { @Override protected void doConsumeParameters(Stack<String> args, Run cmd) { - String arg = args.peek(); + String arg = args.isEmpty() ? "" : args.peek(); if (DEBUG_ARG_VALUE_PATTERN.asPredicate().test(arg)) { // The value matches with the expected format so let's assume that it is a debug argument value args.pop(); @@ -1421,5 +1421,10 @@ public class Run extends CamelCommand { } cmd.jvmDebugPort = parseJvmDebugPort(arg); } + + @Override + protected boolean failIfEmptyArgs() { + return false; + } } }
