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

apupier 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 bbd77df54321 CAMEL-27156: Fix flaky RouteDiagramToolsTest by isolating 
work directory in Run
bbd77df54321 is described below

commit bbd77df5432128472effe2c8011c79c9b378e220
Author: AurĂ©lien Pupier <[email protected]>
AuthorDate: Wed Nov 18 09:24:55 2026 +0100

    CAMEL-27156: Fix flaky RouteDiagramToolsTest by isolating work directory in 
Run
    
    - Encapsulate workDir in Run with getter and setter (and withWorkDir).
    - Isolate temporary work directories for transient transform runs in 
ActionBaseCommand, YamlNormalizeCommand, CamelRouteStructureAction, and 
TransformRoute.
    - Ensure parent directories exist before writing log4j2.properties in 
RuntimeUtil.configureLog.
    - Add deterministic test renderRouteDoesNotWipeSharedWorkDir in 
RouteDiagramToolsTest to verify shared .camel-jbang directory is not wiped.
    
    Co-authored-by: IBM Bob 2.2.1
    Signed-off-by: AurĂ©lien Pupier <[email protected]>
---
 .../apache/camel/dsl/jbang/core/commands/Run.java  | 16 +++-
 .../dsl/jbang/core/commands/TransformRoute.java    | 92 ++++++++++++----------
 .../core/commands/action/ActionBaseCommand.java    |  1 +
 .../commands/action/CamelRouteStructureAction.java | 12 +--
 .../core/commands/mcp/RouteDiagramToolsTest.java   | 22 ++++++
 .../commands/validate/YamlNormalizeCommand.java    |  1 +
 .../camel/dsl/jbang/run/common/RuntimeUtil.java    |  9 ++-
 7 files changed, 103 insertions(+), 50 deletions(-)

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 ec7729748d01..bb6aca509ca6 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
@@ -113,7 +113,21 @@ public class Run extends CamelCommand implements 
CommandLifecycle {
 
     protected Path exportBaseDir;
     // the working directory, which is deleted and created again when running
-    Path workDir = CommandLineHelper.getWorkDir();
+    protected Path workDir = CommandLineHelper.getWorkDir();
+
+    public Path getWorkDir() {
+        return workDir;
+    }
+
+    public void setWorkDir(Path workDir) {
+        this.workDir = workDir;
+    }
+
+    public Run withWorkDir(Path workDir) {
+        this.workDir = workDir;
+        return this;
+    }
+
     boolean scriptRun;
     boolean transformRun;
     boolean transformMessageRun;
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/TransformRoute.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/TransformRoute.java
index 078e98296be7..0181687cda67 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/TransformRoute.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/TransformRoute.java
@@ -40,6 +40,7 @@ import org.apache.camel.dsl.jbang.core.common.CliExitCode;
 import org.apache.camel.dsl.jbang.core.common.CommandLineHelper;
 import org.apache.camel.dsl.jbang.core.common.CompletionCandidates;
 import org.apache.camel.dsl.jbang.run.common.CamelJBangConstants;
+import org.apache.camel.dsl.jbang.run.common.PathUtils;
 import org.apache.camel.main.KameletMain;
 import org.apache.camel.support.ResourceHelper;
 import org.apache.camel.util.IOHelper;
@@ -129,59 +130,68 @@ public class TransformRoute extends CamelCommand {
             return transformToJava();
         }
 
+        Path parent = CommandLineHelper.getWorkDir();
+        Files.createDirectories(parent);
+        Path workDir = Files.createTempDirectory(parent, "transform-route-" + 
ProcessHandle.current().pid() + "-");
         String dump = output;
         // if no output then we want to print to console, so we need to write 
to a hidden file, and dump that file afterwards
         if (output == null || "clipboard".equals(output)) {
-            dump = CommandLineHelper.getWorkDir().resolve("transform-output." 
+ format).toString();
+            dump = workDir.resolve("transform-output." + format).toString();
         }
         Files.deleteIfExists(Path.of(dump));
         final String target = dump;
 
-        if (!compile && !resolvePlaceholders && 
TransformJavaRoutes.applies(files)) {
-            // Java routes read without compiling them: in milliseconds, and 
no code of the project runs
-            TransformJavaRoutes.Result result = 
TransformJavaRoutes.transform(files, format, target, uriAsParameters);
-            if (result.transformed()) {
-                return printDump(target);
+        try {
+            if (!compile && !resolvePlaceholders && 
TransformJavaRoutes.applies(files)) {
+                // Java routes read without compiling them: in milliseconds, 
and no code of the project runs
+                TransformJavaRoutes.Result result = 
TransformJavaRoutes.transform(files, format, target, uriAsParameters);
+                if (result.transformed()) {
+                    return printDump(target);
+                }
+                // a route the parser cannot read completely (a lambda, a 
value known only at runtime): compile them all
             }
-            // a route the parser cannot read completely (a lambda, a value 
known only at runtime): compile them all
-        }
 
-        Run run = new Run(getMain()) {
-            @Override
-            protected void doAddInitialProperty(KameletMain main) {
-                main.addInitialProperty("camel.main.dumpRoutes", format);
-                main.addInitialProperty("camel.main.dumpRoutesInclude", 
"routes,rests,routeConfigurations,beans,dataFormats");
-                main.addInitialProperty("camel.main.dumpRoutesLog", "false");
-                
main.addInitialProperty("camel.main.dumpRoutesResolvePlaceholders", 
Boolean.toString(resolvePlaceholders));
-                
main.addInitialProperty("camel.main.dumpRoutesUriAsParameters", 
Boolean.toString(uriAsParameters));
-                main.addInitialProperty("camel.main.dumpRoutesOutput", target);
-                // turn debug off as this can otherwise include source 
location in dump
-                main.addInitialProperty("camel.debug.enabled", "false");
-                main.addInitialProperty(CamelJBangConstants.TRANSFORM, "true");
-                
main.addInitialProperty("camel.component.properties.ignoreMissingProperty", 
"true");
-                if (ignoreLoadingError) {
-                    // turn off bean method validator if ignore loading error
-                    main.addInitialProperty("camel.language.bean.validate", 
"false");
+            Run run = new Run(getMain()) {
+                @Override
+                protected void doAddInitialProperty(KameletMain main) {
+                    main.addInitialProperty("camel.main.dumpRoutes", format);
+                    main.addInitialProperty("camel.main.dumpRoutesInclude",
+                            
"routes,rests,routeConfigurations,beans,dataFormats");
+                    main.addInitialProperty("camel.main.dumpRoutesLog", 
"false");
+                    
main.addInitialProperty("camel.main.dumpRoutesResolvePlaceholders", 
Boolean.toString(resolvePlaceholders));
+                    
main.addInitialProperty("camel.main.dumpRoutesUriAsParameters", 
Boolean.toString(uriAsParameters));
+                    main.addInitialProperty("camel.main.dumpRoutesOutput", 
target);
+                    // turn debug off as this can otherwise include source 
location in dump
+                    main.addInitialProperty("camel.debug.enabled", "false");
+                    main.addInitialProperty(CamelJBangConstants.TRANSFORM, 
"true");
+                    
main.addInitialProperty("camel.component.properties.ignoreMissingProperty", 
"true");
+                    if (ignoreLoadingError) {
+                        // turn off bean method validator if ignore loading 
error
+                        
main.addInitialProperty("camel.language.bean.validate", "false");
+                    }
                 }
+            };
+            run.files = files;
+            run.setWorkDir(workDir);
+            run.executionLimitOptions.maxSeconds = 1;
+            run.mavenResolver = mavenResolver;
+            Integer exit;
+            try {
+                exit = run.runTransform(ignoreLoadingError);
+            } catch (CliException | NoSuchFileException | 
FileNotFoundException e) {
+                throw e;
+            } catch (Exception e) {
+                // a route that cannot be read, such as invalid YAML (the 
message says where): not a bug of the CLI
+                throw new CliException(CliExitCode.FAILURE, "Cannot transform 
the routes: " + e.getMessage(), e);
+            }
+            if (exit != null && exit != 0) {
+                return exit;
             }
-        };
-        run.files = files;
-        run.executionLimitOptions.maxSeconds = 1;
-        run.mavenResolver = mavenResolver;
-        Integer exit;
-        try {
-            exit = run.runTransform(ignoreLoadingError);
-        } catch (CliException | NoSuchFileException | FileNotFoundException e) 
{
-            throw e;
-        } catch (Exception e) {
-            // a route that cannot be read, such as invalid YAML (the message 
says where): not a bug of the CLI
-            throw new CliException(CliExitCode.FAILURE, "Cannot transform the 
routes: " + e.getMessage(), e);
-        }
-        if (exit != null && exit != 0) {
-            return exit;
-        }
 
-        return printDump(target);
+            return printDump(target);
+        } finally {
+            PathUtils.deleteDirectory(workDir);
+        }
     }
 
     /**
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java
index 1b41bb5c1bf5..f3b70b159079 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java
@@ -308,6 +308,7 @@ abstract class ActionBaseCommand extends CamelCommand {
             }
         };
         run.files = sourceFiles;
+        run.setWorkDir(workDir);
         // the routes are dumped while Camel starts, and a transform run stops 
once Camel has started
         // (camel.main.durationMaxSeconds=-1): a run of a fixed second only 
made each diagram a second slower
         int exit = run.runTransform(ignoreLoadingError);
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStructureAction.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStructureAction.java
index 543cac05d4bd..4a6b3b5310b5 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStructureAction.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStructureAction.java
@@ -17,6 +17,7 @@
 package org.apache.camel.dsl.jbang.core.commands.action;
 
 import java.io.File;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -239,10 +240,10 @@ public class CamelRouteStructureAction extends 
ActionBaseCommand {
             throw CliException.fileNotFound("File does not exist: " + name);
         }
 
-        // a file of its own, as several commands may run at the same time
-        Path output = CommandLineHelper.getWorkDir().resolve(
-                "structure-output-" + ProcessHandle.current().pid() + ".json");
-        PathUtils.deleteFile(output);
+        Path parent = CommandLineHelper.getWorkDir();
+        Files.createDirectories(parent);
+        Path workDir = Files.createTempDirectory(parent, 
"route-structure-source-" + ProcessHandle.current().pid() + "-");
+        Path output = workDir.resolve("structure-output.json");
         final String target = output.toString();
         try {
             if (!compile && TransformJavaRoutes.applies(List.of(name))) {
@@ -267,6 +268,7 @@ public class CamelRouteStructureAction extends 
ActionBaseCommand {
                     }
                 };
                 run.files = List.of(name);
+                run.setWorkDir(workDir);
                 run.executionLimitOptions.maxSeconds = 1;
                 int exit = run.runTransform(ignoreLoadingError);
                 if (exit != 0) {
@@ -279,7 +281,7 @@ public class CamelRouteStructureAction extends 
ActionBaseCommand {
             }
             return jo;
         } finally {
-            PathUtils.deleteFile(output);
+            PathUtils.deleteDirectory(workDir);
         }
     }
 
diff --git 
a/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/RouteDiagramToolsTest.java
 
b/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/RouteDiagramToolsTest.java
index a4012d158db4..87be32bca765 100644
--- 
a/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/RouteDiagramToolsTest.java
+++ 
b/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/RouteDiagramToolsTest.java
@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
 import io.quarkiverse.mcp.server.ToolCallException;
+import org.apache.camel.dsl.jbang.core.common.CommandLineHelper;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
@@ -137,6 +138,27 @@ class RouteDiagramToolsTest {
         assertThat(tempDiagrams()).isEqualTo(before);
     }
 
+    @Test
+    void renderRouteDoesNotWipeSharedWorkDir(@TempDir Path dir) throws 
Exception {
+        // CAMEL-27156: transient run should not wipe the shared .camel-jbang 
directory
+        Path workDir = CommandLineHelper.getWorkDir();
+        Files.createDirectories(workDir);
+        Path marker = workDir.resolve("marker-" + 
ProcessHandle.current().pid() + ".tmp");
+        Files.writeString(marker, "marker");
+        try {
+            Path source = route(dir, "marker-route");
+            RouteDiagramTools tools = new RouteDiagramTools();
+            RouteDiagramTools.RouteDiagramResult result = 
tools.camel_render_route_diagram(
+                    source.toString(), null, "ascii", null, null, null, null, 
null, null);
+
+            assertThat(result.success()).as(result.message()).isTrue();
+            assertThat(result.asciiDiagram()).contains("marker-route");
+            assertThat(Files.exists(marker)).as("Shared work directory marker 
must not be wiped by transient run").isTrue();
+        } finally {
+            Files.deleteIfExists(marker);
+        }
+    }
+
     @Test
     void callsAtTheSameTime(@TempDir Path dir) throws Exception {
         // CAMEL-26932: the calls shared one work directory, which each 
deleted at its start, so of three calls at
diff --git 
a/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlNormalizeCommand.java
 
b/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlNormalizeCommand.java
index 1f3fba9861af..a3510be3fc83 100644
--- 
a/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlNormalizeCommand.java
+++ 
b/dsl/camel-jbang/camel-jbang-plugin-validate/src/main/java/org/apache/camel/dsl/jbang/core/commands/validate/YamlNormalizeCommand.java
@@ -169,6 +169,7 @@ public class YamlNormalizeCommand extends CamelCommand {
                 });
             }
         };
+        run.setWorkDir(workDir);
         run.mavenResolver = mavenResolver;
         run.files = matched;
         run.executionLimitOptions.maxSeconds = 1;
diff --git 
a/dsl/camel-jbang/camel-jbang-run/src/main/java/org/apache/camel/dsl/jbang/run/common/RuntimeUtil.java
 
b/dsl/camel-jbang/camel-jbang-run/src/main/java/org/apache/camel/dsl/jbang/run/common/RuntimeUtil.java
index ee2acf78112e..e0660296cf9f 100644
--- 
a/dsl/camel-jbang/camel-jbang-run/src/main/java/org/apache/camel/dsl/jbang/run/common/RuntimeUtil.java
+++ 
b/dsl/camel-jbang/camel-jbang-run/src/main/java/org/apache/camel/dsl/jbang/run/common/RuntimeUtil.java
@@ -27,7 +27,6 @@ import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.*;
 
 import org.apache.camel.util.IOHelper;
@@ -143,8 +142,12 @@ public final class RuntimeUtil {
             }
             content = content + System.lineSeparator() + sj;
 
-            name = 
CamelHome.getWorkDir().resolve("log4j2.properties").toString();
-            Files.writeString(Paths.get(name), content);
+            Path logFile = CamelHome.getWorkDir().resolve("log4j2.properties");
+            if (logFile.getParent() != null) {
+                Files.createDirectories(logFile.getParent());
+            }
+            Files.writeString(logFile, content);
+            name = logFile.toString();
             // the categories are part of what the command asks for
             location = Path.of(name).toAbsolutePath().toUri() + "#" + 
content.hashCode();
         } else if (export) {

Reply via email to