mvn spotless apply

Author: nevingeorgesunny

src/main/java/com/cloudbees/jenkins/support/SupportAction.java

@@ -34,7 +34,6 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.Functions;
-import hudson.Main;
 import hudson.model.Api;
 import hudson.model.Failure;
 import hudson.model.RootAction;
@@ -43,6 +42,7 @@
 import hudson.security.Permission;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -66,8 +66,6 @@
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
-import jakarta.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.util.ProgressiveRendering;
 import jenkins.util.Timer;
@@ -110,11 +108,12 @@ public class SupportAction implements RootAction, StaplerProxy {
     private final Logger logger = Logger.getLogger(SupportAction.class.getName());
 
     private static final String SUPPORT_BUNDLE_FILE_NAME = "support-bundle.zip";
-    private static final String SUPPORT_BUNDLE_CREATION_FOLDER = Paths.get(System.getProperty("java.io.tmpdir")).resolve("support-bundle").toString();
+    private static final String SUPPORT_BUNDLE_CREATION_FOLDER = Paths.get(System.getProperty("java.io.tmpdir"))
+            .resolve("support-bundle")
+            .toString();
 
     private static final Map<UUID, SupportBundleAsyncGenerator> generatorMap = new ConcurrentHashMap<>();
 
-
     @Override
     @Restricted(NoExternalUse.class)
     public Object getTarget() {
@@ -345,7 +344,6 @@ public void doGenerateAllBundles(StaplerRequest2 req, StaplerResponse2 rsp) thro
         prepareBundle(rsp, components);
     }
 
-
     /**
      * Generates a support bundle with selected components from the UI. in async
      * @param req The stapler request
@@ -354,31 +352,32 @@ public void doGenerateAllBundles(StaplerRequest2 req, StaplerResponse2 rsp) thro
      * @throws IOException If an input or output exception occurs
      */
     @RequirePOST
-    public HttpRedirect doGenerateAllBundlesAsync(StaplerRequest2 req, StaplerResponse2 rsp) throws ServletException, IOException {
+    public HttpRedirect doGenerateAllBundlesAsync(StaplerRequest2 req, StaplerResponse2 rsp)
+            throws ServletException, IOException {
         JSONObject json = req.getSubmittedForm();
         if (!json.has("components")) {
             rsp.sendError(SC_BAD_REQUEST);
             return new HttpRedirect("support");
         }
         final List<Component> components = getComponents(req, json);
 
-        for(Component component:components ){
-            if(component instanceof AboutBrowser){
+        for (Component component : components) {
+            if (component instanceof AboutBrowser) {
                 AboutBrowser aboutBrowser = (AboutBrowser) component;
                 aboutBrowser.setScreenResolution(Functions.getScreenResolution());
                 aboutBrowser.setCurrentRequest(Stapler.getCurrentRequest2());
                 aboutBrowser.setGeneratedAsync(true);
             }
 
-            if(component instanceof ReverseProxy){
+            if (component instanceof ReverseProxy) {
                 ReverseProxy reverseProxy = (ReverseProxy) component;
                 reverseProxy.setCurrentRequest(Stapler.getCurrentRequest2());
             }
         }
 
         UUID taskId = UUID.randomUUID();
         SupportBundleAsyncGenerator supportBundleAsyncGenerator = new SupportBundleAsyncGenerator();
-        supportBundleAsyncGenerator.init(taskId,components);
+        supportBundleAsyncGenerator.init(taskId, components);
         generatorMap.put(taskId, supportBundleAsyncGenerator);
 
         return new HttpRedirect("progressPage?taskId=" + taskId);
@@ -511,31 +510,34 @@ public ProgressiveRendering getGenerateSupportBundle(@QueryParameter String task
         return generatorMap.get(UUID.fromString(taskId));
     }
 
-    public static class SupportBundleAsyncGenerator extends ProgressiveRendering{
+    public static class SupportBundleAsyncGenerator extends ProgressiveRendering {
         private final Logger logger = Logger.getLogger(SupportBundleAsyncGenerator.class.getName());
         private UUID taskId;
         private boolean isCompleted;
         private String pathToBundle;
         private List<Component> components;
         private boolean supportBundleGenerationInProgress = false;
 
-        public SupportBundleAsyncGenerator init( UUID taskId,List<Component> components) {
+        public SupportBundleAsyncGenerator init(UUID taskId, List<Component> components) {
             this.taskId = taskId;
             this.components = components;
             return this;
         }
 
         @Override
         protected void compute() throws Exception {
-            if(!supportBundleGenerationInProgress) {
+            if (!supportBundleGenerationInProgress) {
                 this.supportBundleGenerationInProgress = true;
-                logger.info("Generating support bundle... task id "+ taskId);
+                logger.info("Generating support bundle... task id " + taskId);
                 File outputDir = new File(SUPPORT_BUNDLE_CREATION_FOLDER + "/" + taskId);
                 if (!outputDir.exists()) {
-                    outputDir.mkdirs();
+                    if (!outputDir.mkdirs()) {
+                        throw new IOException("Failed to create directory: " + outputDir.getAbsolutePath());
+                    }
                 }
 
-                try (FileOutputStream fileOutputStream = new FileOutputStream(new File(outputDir, SUPPORT_BUNDLE_FILE_NAME))) {
+                try (FileOutputStream fileOutputStream =
+                        new FileOutputStream(new File(outputDir, SUPPORT_BUNDLE_FILE_NAME))) {
                     SupportPlugin.setRequesterAuthentication(Jenkins.getAuthentication2());
                     try {
                         try (ACLContext ignored = ACL.as2(ACL.SYSTEM2)) {
@@ -568,25 +570,25 @@ protected JSON data() {
         }
     }
 
-
     public void doDownloadBundle(@QueryParameter("taskId") String taskId, StaplerResponse2 rsp) throws IOException {
-        File bundleFile = new File(SUPPORT_BUNDLE_CREATION_FOLDER + "/" + taskId + "/"+SUPPORT_BUNDLE_FILE_NAME);
+        File bundleFile = new File(SUPPORT_BUNDLE_CREATION_FOLDER + "/" + taskId + "/" + SUPPORT_BUNDLE_FILE_NAME);
         if (!bundleFile.exists()) {
             rsp.sendError(HttpServletResponse.SC_NOT_FOUND, "Support bundle file not found");
             return;
         }
 
         rsp.setContentType("application/zip");
-        rsp.addHeader("Content-Disposition", "attachment; filename="+SUPPORT_BUNDLE_FILE_NAME);
-        try (ServletOutputStream outputStream = rsp.getOutputStream(); FileInputStream inputStream = new FileInputStream(bundleFile)) {
+        rsp.addHeader("Content-Disposition", "attachment; filename=" + SUPPORT_BUNDLE_FILE_NAME);
+        try (ServletOutputStream outputStream = rsp.getOutputStream();
+                FileInputStream inputStream = new FileInputStream(bundleFile)) {
             IOUtils.copy(inputStream, outputStream);
         }
 
         // Clean up temporary files after assembling the full bundle
         Timer.get()
                 .schedule(
                         () -> {
-                            File outputDir = new File(SUPPORT_BUNDLE_CREATION_FOLDER+ "/"  + taskId);
+                            File outputDir = new File(SUPPORT_BUNDLE_CREATION_FOLDER + "/" + taskId);
 
                             try {
                                 FileUtils.deleteDirectory(outputDir);

src/main/resources/com/cloudbees/jenkins/support/SupportAction/progressPage.jelly

@@ -10,12 +10,21 @@
             <h2>Generating Support Bundle</h2>
             <p id="progressMessage">Generating a support bundle for this Jenkins instance. This may take a few minutes.</p>
             <l:progressiveRendering handler="${it.getGenerateSupportBundle(request.getParameter('taskId'))}" callback="updateProgressUI"/>
+            <l:progressAnimation/>
             <a id="downloadButton" style="display:none;" class="btn btn-primary" href="#">Download Support Bundle</a>
         </l:main-panel>
 
         <script>
             function updateProgressUI(data) {
+                var progressBar = document.querySelector('.app-progress-bar');
+                if (progressBar) {
+                    progressBar.style.display = 'none';
+                }
                 if (data.isCompleted === true) {
+                    var ellipsisProgressBar = document.querySelector('.lds-ellipsis');
+                    if (ellipsisProgressBar) {
+                        ellipsisProgressBar.style.display = 'none';
+                    }
                     downloadButton.style.display = "block";
                     downloadButton.href = "downloadBundle?taskId=" + data.taskId; // Update this path accordingly
                     document.getElementById("progressMessage").textContent = "Support bundle has been generated.";

src/test/java/com/cloudbees/jenkins/support/SupportActionTest.java

@@ -97,15 +97,14 @@ public void download() throws IOException, SAXException {
         downloadBundle("/download?json={\"components\":1}");
     }
 
-
     @Test
     public void generateAllBundles() throws IOException, SAXException {
         downloadBundle("/generateAllBundles?json={\"components\":1}");
     }
 
     @Test
     public void generateBundlesByUIButtonClick() throws IOException, SAXException, InterruptedException {
-        ZipFile  supportBundle = downloadSupportBundleByButtonClick();
+        ZipFile supportBundle = downloadSupportBundleByButtonClick();
         assertNotNull(supportBundle.getEntry("manifest.md"));
         cleanUp();
     }