[camel] branch camel-4.1.x updated: CAMEL-19982: camel-jbang - Allow --jvm-debug as last parameter (#11714)

[nf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nfilotto pushed a commit to branch camel-4.1.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-4.1.x by this push:
     new 628508a6676 CAMEL-19982: camel-jbang - Allow --jvm-debug as last parameter (#11714)
628508a6676 is described below

commit 628508a667684b8bbb292a9d71959a1a5f1e2d6f
Author: Nicolas Filotto <es...@users.noreply.github.com>
AuthorDate: Thu Oct 12 20:07:44 2023 +0200

    CAMEL-19982: camel-jbang - Allow --jvm-debug as last parameter (#11714)
    
    ## Motivation
    
    When `--jvm-debug` is used as last parameter in a run command like `camel run MyKafka.java --jvm-debug`, it fails with the next error `Error: missing required parameter`
    
    ## Modifications:
    
    * Allow to prevent throwing exception when there are no arguments left in `ParameterConsumer`
    * Add support of empty arguments in `DebugConsumer`
---
 .../org/apache/camel/dsl/jbang/core/commands/CamelCommand.java     | 6 +++++-
 .../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java    | 7 ++++++-
 2 files changed, 11 insertions(+), 2 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 5446fe8ee0c..d1a0ecacf73 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
@@ -1407,7 +1407,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();
@@ -1417,5 +1417,10 @@ public class Run extends CamelCommand {
             }
             cmd.jvmDebugPort = parseJvmDebugPort(arg);
         }
+
+        @Override
+        protected boolean failIfEmptyArgs() {
+            return false;
+        }
     }
 }