From 5d630a24bed07dca20b6ddf55ffe4be36399ad0f Mon Sep 17 00:00:00 2001
From: "Begonia, HE" <163421589+BegoniaHe@users.noreply.github.com>
Date: Thu, 29 Jan 2026 03:20:10 +0100
Subject: fix: resolve rebase conflicts and compilation errors

- Export JavaError from java module
- Fix type mismatches in Adoptium provider methods
- Add type annotations for reqwest json() calls
- Remove non-existent cache_version field from JavaCatalog
- Fix resolve_java_for_launch call signature (remove extra window param)
- Add error conversion to String for Tauri commands
- Fix import for save_catalog_cache in adoptium.rs

Reviewed-by: Claude Sonnet 4.5
---
 src-tauri/src/core/java/providers/adoptium.rs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src-tauri/src/core/java/providers')

diff --git a/src-tauri/src/core/java/providers/adoptium.rs b/src-tauri/src/core/java/providers/adoptium.rs
index 40e1757..a73a0f6 100644
--- a/src-tauri/src/core/java/providers/adoptium.rs
+++ b/src-tauri/src/core/java/providers/adoptium.rs
@@ -1,5 +1,6 @@
 use crate::core::java::error::JavaError;
 use crate::core::java::provider::JavaProvider;
+use crate::core::java::save_catalog_cache;
 use crate::core::java::{ImageType, JavaCatalog, JavaDownloadInfo, JavaReleaseInfo};
 use serde::Deserialize;
 use tauri::AppHandle;
@@ -72,7 +73,7 @@ impl JavaProvider for AdoptiumProvider {
         force_refresh: bool,
     ) -> Result<JavaCatalog, JavaError> {
         if !force_refresh {
-            if let Ok(Some(cached)) = crate::core::java::load_cached_catalog(app_handle) {
+            if let Some(cached) = crate::core::java::load_cached_catalog(app_handle) {
                 return Ok(cached);
             }
         }
@@ -90,7 +91,7 @@ impl JavaProvider for AdoptiumProvider {
             .map_err(|e| {
                 JavaError::NetworkError(format!("Failed to fetch available releases: {}", e))
             })?
-            .json()
+            .json::<AvailableReleases>()
             .await
             .map_err(|e| {
                 JavaError::SerializationError(format!("Failed to parse available releases: {}", e))
@@ -202,10 +203,9 @@ impl JavaProvider for AdoptiumProvider {
             available_major_versions: available.available_releases,
             lts_versions: available.available_lts_releases,
             cached_at: now,
-            cache_version: 1,
         };
 
-        let _ = super::super::save_catalog_cache(app_handle, &catalog);
+        let _ = save_catalog_cache(app_handle, &catalog);
 
         Ok(catalog)
     }
@@ -238,9 +238,10 @@ impl JavaProvider for AdoptiumProvider {
             )));
         }
 
-        let assets: Vec<AdoptiumAsset> = response.json().await.map_err(|e| {
-            JavaError::SerializationError(format!("Failed to parse API response: {}", e))
-        })?;
+        let assets: Vec<AdoptiumAsset> =
+            response.json::<Vec<AdoptiumAsset>>().await.map_err(|e| {
+                JavaError::SerializationError(format!("Failed to parse API response: {}", e))
+            })?;
 
         let asset = assets
             .into_iter()
@@ -265,9 +266,10 @@ impl JavaProvider for AdoptiumProvider {
             .await
             .map_err(|e| JavaError::NetworkError(format!("Network request failed: {}", e)))?;
 
-        let releases: AvailableReleases = response.json().await.map_err(|e| {
-            JavaError::SerializationError(format!("Failed to parse response: {}", e))
-        })?;
+        let releases: AvailableReleases =
+            response.json::<AvailableReleases>().await.map_err(|e| {
+                JavaError::SerializationError(format!("Failed to parse response: {}", e))
+            })?;
 
         Ok(releases.available_releases)
     }
-- 
cgit v1.2.3-70-g09d2