搜索 Java 时缓存 Java 信息

HMCL/src/main/java/org/jackhuang/hmcl/java/HMCLJavaRepository.java

@@ -99,7 +99,7 @@ public boolean isInstalled(Platform platform, GameJavaVersion gameJavaVersion) {
         return getJavaExecutable(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.component());
     }
 
-    private static void getAllJava(List<JavaRuntime> list, Platform platform, Path platformRoot, boolean isManaged) {
+    private static void getAllJava(List<Path> list, Platform platform, Path platformRoot) {
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(platformRoot)) {
             for (Path file : stream) {
                 try {
@@ -117,8 +117,7 @@ private static void getAllJava(List<JavaRuntime> list, Platform platform, Path p
                         }
 
                         if (Files.isDirectory(javaDir)) {
-                            JavaManifest manifest = JsonUtils.fromJsonFile(file, JavaManifest.class);
-                            list.add(JavaRuntime.of(executable, manifest.getInfo(), isManaged));
+                            list.add(executable);
                         }
                     }
                 } catch (Throwable e) {
@@ -131,20 +130,14 @@ private static void getAllJava(List<JavaRuntime> list, Platform platform, Path p
     }
 
     @Override
-    public Collection<JavaRuntime> getAllJava(Platform platform) {
+    public Collection<Path> getAllJava(Platform platform) {
         Path platformRoot = getPlatformRoot(platform);
         if (!Files.isDirectory(platformRoot))
             return Collections.emptyList();
 
-        ArrayList<JavaRuntime> list = new ArrayList<>();
-
-        getAllJava(list, platform, platformRoot, true);
-        if (platform.getOperatingSystem() == OperatingSystem.MACOS) {
-            platformRoot = root.resolve(platform.getOperatingSystem().getMojangName() + "-" + platform.getArchitecture().getCheckedName());
-            if (Files.isDirectory(platformRoot))
-                getAllJava(list, platform, platformRoot, false);
-        }
+        ArrayList<Path> list = new ArrayList<>();
 
+        getAllJava(list, platform, platformRoot);
         return list;
     }
 
@@ -166,7 +159,7 @@ public Task<JavaRuntime> getDownloadJavaTask(DownloadProvider downloadProvider,
 
             JavaInfo info;
             if (JavaManager.isCompatible(platform))
-                info = JavaInfoUtils.fromExecutable(executable, false);
+                info = JavaInfoUtils.fromExecutable(executable);
             else
                 info = new JavaInfo(platform, result.download().version().name(), null);
 

HMCL/src/main/java/org/jackhuang/hmcl/java/JavaInfoUtils.java

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.java;
 
 import com.google.gson.annotations.SerializedName;
+import org.jackhuang.hmcl.util.gson.JsonSerializable;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
@@ -27,7 +28,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 
 /**
@@ -39,35 +39,10 @@ public final class JavaInfoUtils {
     private JavaInfoUtils() {
     }
 
-    private static Path tryFindReleaseFile(Path executable) {
-        Path parent = executable.getParent();
-        if (parent != null && parent.getFileName() != null && parent.getFileName().toString().equals("bin")) {
-            Path javaHome = parent.getParent();
-            if (javaHome != null && javaHome.getFileName() != null) {
-                Path releaseFile = javaHome.resolve("release");
-                String javaHomeName = javaHome.getFileName().toString();
-                if ((javaHomeName.contains("jre") || javaHomeName.contains("jdk") || javaHomeName.contains("openj9"))
-                        && Files.isRegularFile(releaseFile)) {
-                    return releaseFile;
-                }
-            }
-        }
-        return null;
-    }
-
-    public static @NotNull JavaInfo fromExecutable(Path executable, boolean tryFindReleaseFile) throws IOException {
+    public static @NotNull JavaInfo fromExecutable(Path executable) throws IOException {
         assert executable.isAbsolute();
 
-        Path releaseFile;
-        if (tryFindReleaseFile && (releaseFile = tryFindReleaseFile(executable)) != null) {
-            try {
-                return JavaInfo.fromReleaseFile(releaseFile);
-            } catch (IOException ignored) {
-            }
-        }
-
         Path thisPath = JarUtils.thisJarPath();
-
         if (thisPath == null) {
             throw new IOException("Failed to find current HMCL location");
         }
@@ -94,7 +69,6 @@ private static Path tryFindReleaseFile(Path executable) {
                             ? architecture
                             : Architecture.SYSTEM_ARCH);
 
-
             return new JavaInfo(platform, result.javaVersion, result.javaVendor);
         } catch (IOException e) {
             throw e;
@@ -103,14 +77,9 @@ private static Path tryFindReleaseFile(Path executable) {
         }
     }
 
-    private static final class Result {
-        @SerializedName("os.name")
-        public String osName;
-        @SerializedName("os.arch")
-        public String osArch;
-        @SerializedName("java.version")
-        public String javaVersion;
-        @SerializedName("java.vendor")
-        public String javaVendor;
+    @JsonSerializable
+    private record Result(@SerializedName("os.name") String osName, @SerializedName("os.arch") String osArch,
+                          @SerializedName("java.version") String javaVersion,
+                          @SerializedName("java.vendor") String javaVendor) {
     }
 }