From 83e9e3c6067c8a2016676d461c17835d4da8b7ab Mon Sep 17 00:00:00 2001
From: "Begonia, HE" <163421589+BegoniaHe@users.noreply.github.com>
Date: Sun, 25 Jan 2026 10:28:46 +0100
Subject: refactor(java): address Sourcery AI code review feedback

- Centralize strip_unc_prefix into java/mod.rs to eliminate duplication across detection.rs and validation.rs
- Remove unused JAVA_CHECK_TIMEOUT constant from validation.rs
- Implement actual timeout mechanism in run_which_command_with_timeout() using try_wait() loop
- Parallelize Adoptium API requests for better catalog fetch performance

Fixes:
- Multiple strip_unc_prefix implementations consolidated
- Timeout constant now properly enforced in which/where command execution
- Catalog fetching now uses concurrent tokio::spawn tasks instead of sequential await

Reviewed-by: Claude Sonnet 4.5
---
 src-tauri/src/core/java/mod.rs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'src-tauri/src/core/java/mod.rs')

diff --git a/src-tauri/src/core/java/mod.rs b/src-tauri/src/core/java/mod.rs
index fd82390..05bf734 100644
--- a/src-tauri/src/core/java/mod.rs
+++ b/src-tauri/src/core/java/mod.rs
@@ -9,6 +9,18 @@ pub mod validation;
 pub mod provider;
 pub mod providers;
 
+/// Remove the UNC prefix (\\?\) from Windows paths
+pub fn strip_unc_prefix(path: PathBuf) -> PathBuf {
+    #[cfg(target_os = "windows")]
+    {
+        let s = path.to_string_lossy().to_string();
+        if s.starts_with(r"\\?\\") {
+            return PathBuf::from(&s[4..]);
+        }
+    }
+    path
+}
+
 use crate::core::downloader::{DownloadQueue, JavaDownloadProgress, PendingJavaDownload};
 use crate::utils::zip;
 use provider::JavaProvider;
@@ -267,7 +279,7 @@ pub async fn download_and_install_java(
     }
 
     let java_bin = std::fs::canonicalize(&java_bin).map_err(|e| e.to_string())?;
-    let java_bin = validation::strip_unc_prefix(java_bin);
+    let java_bin = strip_unc_prefix(java_bin);
 
     let installation = validation::check_java_installation(&java_bin)
         .await
@@ -431,7 +443,7 @@ fn find_java_executable(dir: &PathBuf) -> Option<PathBuf> {
     let direct_bin = dir.join("bin").join(bin_name);
     if direct_bin.exists() {
         let resolved = std::fs::canonicalize(&direct_bin).unwrap_or(direct_bin);
-        return Some(validation::strip_unc_prefix(resolved));
+        return Some(strip_unc_prefix(resolved));
     }
 
     #[cfg(target_os = "macos")]
@@ -449,7 +461,7 @@ fn find_java_executable(dir: &PathBuf) -> Option<PathBuf> {
                 let nested_bin = path.join("bin").join(bin_name);
                 if nested_bin.exists() {
                     let resolved = std::fs::canonicalize(&nested_bin).unwrap_or(nested_bin);
-                    return Some(validation::strip_unc_prefix(resolved));
+                    return Some(strip_unc_prefix(resolved));
                 }
 
                 #[cfg(target_os = "macos")]
-- 
cgit v1.2.3-70-g09d2