Merge pull request #31710 from phillip-kruger/devui-tmp-fix

Dev UI: clean up build-time-data files

Author: gsmet

extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java

@@ -245,8 +245,6 @@ QuteTemplateBuildItem createIndexHtmlTemplate(
         String themeVars = themeVarsBuildItem.getTemplateValue();
         String contextRoot = nonApplicationRootPathBuildItem.getNonApplicationRootPath() + DEV_UI + SLASH;
 
-        // TODO: Move version and name to build time data
-
         Map<String, Object> data = Map.of(
                 "contextRoot", contextRoot,
                 "importmap", importmap,

extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java

@@ -152,14 +152,18 @@ void registerDevUiHandlers(
 
         String basepath = nonApplicationRootPathBuildItem.resolvePath(DEVUI);
         // For static content generated at build time
+        Path devUiBasePath = Files.createTempDirectory("quarkus-devui");
+        recorder.shutdownTask(shutdownContext, devUiBasePath.toString());
+
         for (StaticContentBuildItem staticContentBuildItem : staticContentBuildItems) {
 
             Map<String, String> urlAndPath = new HashMap<>();
             if (staticContentBuildItem.isInternal()) {
                 List<DevUIContent> content = staticContentBuildItem.getContent();
                 for (DevUIContent c : content) {
                     String parsedContent = Qute.fmt(new String(c.getTemplate()), c.getData());
-                    Path tempFile = Files.createTempFile("quarkus-dev-ui-", c.getFileName());
+                    Path tempFile = devUiBasePath
+                            .resolve(c.getFileName());
                     Files.write(tempFile, parsedContent.getBytes(StandardCharsets.UTF_8));
 
                     urlAndPath.put(c.getFileName(), tempFile.toString());

extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIRecorder.java

@@ -1,10 +1,19 @@
 package io.quarkus.devui.runtime;
 
+import java.io.IOException;
 import java.net.URL;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.jboss.logging.Logger;
+
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.devui.runtime.comms.JsonRpcRouter;
 import io.quarkus.devui.runtime.jsonrpc.JsonRpcMethod;
@@ -18,6 +27,11 @@
 
 @Recorder
 public class DevUIRecorder {
+    private static final Logger LOG = Logger.getLogger(DevUIRecorder.class);
+
+    public void shutdownTask(ShutdownContext shutdownContext, String devUIBasePath) {
+        shutdownContext.addShutdownTask(new DeleteDirectoryRunnable(devUIBasePath));
+    }
 
     public void createJsonRpcRouter(BeanContainer beanContainer,
             Map<String, Map<JsonRpcMethodName, JsonRpcMethod>> extensionMethodsMap) {
@@ -50,4 +64,35 @@ public Handler<RoutingContext> vaadinRouterHandler(String basePath) {
     public Handler<RoutingContext> mvnpmHandler(Set<URL> mvnpmJarFiles) {
         return new MvnpmHandler(mvnpmJarFiles);
     }
+
+    private static final class DeleteDirectoryRunnable implements Runnable {
+
+        private final Path directory;
+
+        private DeleteDirectoryRunnable(String directory) {
+            this.directory = Paths.get(directory);
+        }
+
+        @Override
+        public void run() {
+            try {
+                Files.walkFileTree(directory,
+                        new SimpleFileVisitor<Path>() {
+                            @Override
+                            public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                                Files.delete(dir);
+                                return FileVisitResult.CONTINUE;
+                            }
+
+                            @Override
+                            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                                Files.delete(file);
+                                return FileVisitResult.CONTINUE;
+                            }
+                        });
+            } catch (IOException e) {
+                LOG.error("Error cleaning up dev-ui temporary directory: " + directory, e);
+            }
+        }
+    }
 }