(camel) branch main updated: CAMEL-20737: camel-jbang - Export with fresh does not work. Export should read application.properties if present.

[davsclaus]

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


The following commit(s) were added to refs/heads/main by this push:
     new 1d2000b0298 CAMEL-20737: camel-jbang - Export with fresh does not 
work. Export should read application.properties if present.
1d2000b0298 is described below

commit 1d2000b0298941f0fcfa9c4bf3bb3ea4ce0fd8df
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat May 4 13:57:30 2024 +0200

    CAMEL-20737: camel-jbang - Export with fresh does not work. Export should 
read application.properties if present.
---
 .../org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java     | 2 +-
 .../java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java  | 2 +-
 .../org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java    | 2 +-
 .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index 782589666ea..d833f666416 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -59,7 +59,7 @@ class ExportCamelMain extends Export {
 
         // the settings file has information what to export
         File settings = new File(CommandLineHelper.getWorkDir(), 
Run.RUN_SETTINGS_FILE);
-        if (fresh || files != null || !settings.exists()) {
+        if (fresh || !files.isEmpty() || !settings.exists()) {
             // allow to automatic build
             if (!quiet && fresh) {
                 printer().println("Generating fresh run data");
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index c736b920bfb..1e481b29b33 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -62,7 +62,7 @@ class ExportQuarkus extends Export {
 
         // the settings file has information what to export
         File settings = new File(CommandLineHelper.getWorkDir(), 
Run.RUN_SETTINGS_FILE);
-        if (fresh || files != null || !settings.exists()) {
+        if (fresh || !files.isEmpty() || !settings.exists()) {
             // allow to automatic build
             if (!quiet) {
                 printer().println("Generating fresh run data");
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index e7d8165bd6f..948b4c6d2df 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -63,7 +63,7 @@ class ExportSpringBoot extends Export {
 
         // the settings file has information what to export
         File settings = new File(CommandLineHelper.getWorkDir(), 
Run.RUN_SETTINGS_FILE);
-        if (fresh || files != null || !settings.exists()) {
+        if (fresh || !files.isEmpty() || !settings.exists()) {
             // allow to automatic build
             if (!quiet) {
                 printer().println("Generating fresh run data");
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 35acf9e6b57..07420806a1a 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
@@ -455,8 +455,8 @@ public class Run extends CamelCommand {
                                          + " because application.properties 
file does not exist or camel.main.routesIncludePattern is not configured");
                         return 1;
                     } else {
-                        // silent-run then auto-detect all files (except 
properties as they are loaded explicit)
-                        String[] allFiles = new File(".").list((dir, name) -> 
!name.endsWith(".properties"));
+                        // silent-run then auto-detect all files
+                        String[] allFiles = new File(".").list();
                         if (allFiles != null) {
                             files.addAll(Arrays.asList(allFiles));
                         }