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 2f818ce0c13 CAMEL-22228: camel-jbang: Fixed using dot in file name
when exporting.
2f818ce0c13 is described below
commit 2f818ce0c13195c2a32291f597f304e17f6e05be
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Jul 22 09:38:23 2025 +0200
CAMEL-22228: camel-jbang: Fixed using dot in file name when exporting.
---
.../camel/dsl/jbang/core/commands/Export.java | 5 +++++
.../apache/camel/dsl/jbang/core/commands/Run.java | 15 +--------------
.../camel/dsl/jbang/core/commands/RunHelper.java | 21 +++++++++++++++++++++
3 files changed, 27 insertions(+), 14 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 772c44e3585..e5fc01ccbaa 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
@@ -226,6 +226,11 @@ public class Export extends ExportBaseCommand {
}
}
+ // special if user type: camel export .
+ if (files.size() == 1 && ".".equals(files.get(0))) {
+ RunHelper.dotToFiles(files);
+ }
+
if (!files.isEmpty()) {
return FileUtil.onlyName(SourceScheme.onlyName(files.get(0)));
}
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 4139096e218..47580cc3796 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
@@ -465,20 +465,7 @@ public class Run extends CamelCommand {
// special if user type: camel run .
if (sourceDir == null && (files != null && files.size() == 1 &&
".".equals(files.get(0)))) {
- files.clear();
- try {
- Files.list(Paths.get("."))
- .filter(p -> {
- try {
- return Files.isRegularFile(p) &&
!Files.isHidden(p);
- } catch (IOException e) {
- return false;
- }
- })
- .forEach(p -> files.add(p.getFileName().toString()));
- } catch (IOException e) {
- // Ignore
- }
+ RunHelper.dotToFiles(files);
}
if (!exportRun) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/RunHelper.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/RunHelper.java
index b8057f44cad..afd2a4022c7 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/RunHelper.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/RunHelper.java
@@ -281,4 +281,25 @@ public final class RunHelper {
}
}
}
+
+ /**
+ * When using camel run . or camel export . then dot should include all
the files in the current folder.
+ */
+ public static void dotToFiles(List<String> files) {
+ files.clear();
+ try {
+ Files.list(Paths.get("."))
+ .filter(p -> {
+ try {
+ return Files.isRegularFile(p) &&
!Files.isHidden(p);
+ } catch (IOException e) {
+ return false;
+ }
+ })
+ .forEach(p -> files.add(p.getFileName().toString()));
+ } catch (IOException e) {
+ // Ignore
+ }
+ }
+
}