(camel) branch camel-4.10.x updated: CAMEL-21939: camel-jbang: Fix export to not run twice, and also fix camel-export.log, and be able to log to console and add the verbose option also.

[davsclaus]

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

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


The following commit(s) were added to refs/heads/camel-4.10.x by this push:
     new 26d8cc614ec CAMEL-21939: camel-jbang: Fix export to not run twice, and 
also fix camel-export.log, and be able to log to console and add the verbose 
option also.
26d8cc614ec is described below

commit 26d8cc614ec27d76e0d66c838a6ce5f3882bbfe4
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Apr 8 11:25:18 2025 +0200

    CAMEL-21939: camel-jbang: Fix export to not run twice, and also fix 
camel-export.log, and be able to log to console and add the verbose option also.
---
 .../apache/camel/dsl/jbang/core/commands/Export.java | 20 +++++++++++---------
 .../core/commands/kubernetes/KubernetesExport.java   |  6 ++++--
 .../core/commands/kubernetes/KubernetesRun.java      |  5 +++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
index 8f355c9ecbd..c7a8578886a 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
@@ -49,6 +49,14 @@ public class Export extends ExportBaseCommand {
 
     @Override
     protected Integer export() throws Exception {
+        int answer = doExport();
+        if (answer == 0 && !quiet) {
+            printer().println("Project export successful!");
+        }
+        return answer;
+    }
+
+    protected Integer doExport() throws Exception {
         // application.properties
         doLoadAndInitProfileProperties(new File("application.properties"));
         if (profile != null) {
@@ -70,27 +78,21 @@ public class Export extends ExportBaseCommand {
             gav = "org.example.project:%s:%s".formatted(pn, getVersion());
         }
 
-        int answer;
         switch (runtime) {
             case springBoot -> {
-                answer = export(new ExportSpringBoot(getMain()));
+                return export(new ExportSpringBoot(getMain()));
             }
             case quarkus -> {
-                answer = export(new ExportQuarkus(getMain()));
+                return export(new ExportQuarkus(getMain()));
             }
             case main -> {
-                answer = export(new ExportCamelMain(getMain()));
+                return export(new ExportCamelMain(getMain()));
             }
             default -> {
                 printer().printErr("Unknown runtime: " + runtime);
                 return 1;
             }
         }
-
-        if (answer == 0 && !quiet) {
-            printer().println("Project export successful!");
-        }
-        return answer;
     }
 
     private void doLoadAndInitProfileProperties(File file) throws Exception {
diff --git 
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
 
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
index cb3af7c2571..2e07c08e98b 100644
--- 
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
+++ 
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
@@ -175,6 +175,7 @@ public class KubernetesExport extends Export {
         quiet = configurer.quiet;
         logging = configurer.logging;
         loggingLevel = configurer.loggingLevel;
+        verbose = configurer.verbose;
     }
 
     public Integer export() throws Exception {
@@ -328,7 +329,7 @@ public class KubernetesExport extends Export {
         buildProperties.add("jkube.version=%s".formatted(jkubeVersion));
 
         // Run export
-        int exit = super.export();
+        int exit = super.doExport();
         if (exit != 0) {
             printer().println("Project export failed");
             return exit;
@@ -541,6 +542,7 @@ public class KubernetesExport extends Export {
             boolean download,
             boolean quiet,
             boolean logging,
-            String loggingLevel) {
+            String loggingLevel,
+            boolean verbose) {
     }
 }
diff --git 
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
 
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
index 18e5ba74980..ef044ff81b8 100644
--- 
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
+++ 
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
@@ -385,8 +385,9 @@ public class KubernetesRun extends KubernetesBaseCommand {
                 true,
                 true,
                 (quiet || output != null),
-                false,
-                "off");
+                true,
+                "info",
+                verbose);
         KubernetesExport export = new KubernetesExport(getMain(), configurer);
 
         export.image = image;