fix: caching now works

Author: quintesse

pom.xml

@@ -33,7 +33,8 @@
         <maven.compiler.target>11</maven.compiler.target>
         <native.maven.plugin>0.11.2</native.maven.plugin>
         <mainClass>org.codejive.jvm.Main</mainClass>
-        <version.devkitman>0.4.2</version.devkitman>
+        <version.devkitman>0.4.3</version.devkitman>
+        <version.httpclient>5.6</version.httpclient>
         <version.asciitable>0.3.2</version.asciitable>
         <version.picocli>4.7.7</version.picocli>
         <version.snakeyaml>2.5</version.snakeyaml>
@@ -51,6 +52,11 @@
             <artifactId>devkitman</artifactId>
             <version>${version.devkitman}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5-cache</artifactId>
+            <version>${version.httpclient}</version>
+        </dependency>
         <dependency>
             <groupId>de.vandermeer</groupId>
             <artifactId>asciitable</artifactId>
@@ -76,7 +82,12 @@
             <artifactId>slf4j-simple</artifactId>
             <version>${version.slf4j}</version>
         </dependency>
-        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${version.slf4j}</version>
+        </dependency>
+
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

src/main/java/org/codejive/jvm/Main.java

@@ -85,7 +85,7 @@ abstract static class CmdBase implements Callable<Integer> {}
     static class ListInstalled extends CmdBase {
         @Override
         public Integer call() {
-            JdkManager manager = JdkManager.create();
+            JdkManager manager = createJdkManager();
             manager.getOrInstallJdk("11+");
             List<Jdk.InstalledJdk> jdks = manager.listInstalledJdks();
             jdks.sort(Comparator.<Jdk>naturalOrder().reversed());
@@ -119,7 +119,7 @@ static class ListAvailable extends CmdBase {
         @Override
         public Integer call() {
             System.err.println("Retrieving available Java versions, this can take a moment...");
-            JdkManager manager = JdkManager.create();
+            JdkManager manager = createJdkManager();
             List<Jdk.AvailableJdk> jdks = manager.listAvailableJdks();
             jdks.sort(Comparator.<Jdk>naturalOrder().reversed());
 
@@ -183,7 +183,7 @@ static class Install extends CmdBase {
         @Override
         public Integer call() {
             String versionOrId = javaVersionParamMixin.getVersionOrId(quiet);
-            JdkManager jdkMan = JdkManager.create();
+            JdkManager jdkMan = createJdkManager();
             Jdk jdk = jdkMan.getInstalledJdk(versionOrId, JdkProvider.Predicates.canUpdate);
             if (!force && jdk != null) {
                 if (!quiet) {
@@ -226,7 +226,7 @@ void setJavaVersion(String versionOrId) {
 
         @Override
         public Integer call() {
-            JdkManager jdkMan = JdkManager.create();
+            JdkManager jdkMan = createJdkManager();
             Jdk.InstalledJdk jdk =
                     jdkMan.getInstalledJdk(versionOrId, JdkProvider.Predicates.canUpdate);
             if (jdk == null) {
@@ -283,7 +283,7 @@ static class Env extends CmdBase {
 
         @Override
         public Integer call() {
-            JdkManager jdkMan = JdkManager.create();
+            JdkManager jdkMan = createJdkManager();
             Jdk jdk = jdkMan.getOrInstallJdk(javaVersionParamMixin.getVersionOrId(quiet));
             return 0;
         }
@@ -305,7 +305,7 @@ public Integer call() throws IOException {
             if (cmd.isEmpty()) {
                 return 0;
             }
-            JdkManager jdkMan = JdkManager.create();
+            JdkManager jdkMan = createJdkManager();
             Jdk.InstalledJdk jdk =
                     jdkMan.getOrInstallJdk(javaVersionOptionMixin.getVersionOrId(quiet));
             if (Paths.get(cmd.get(0)).getNameCount() == 1) {
@@ -430,6 +430,29 @@ private static boolean isId(String s) {
         return s.matches("[a-zA-Z0-9_\\-.]+");
     }
 
+    private static JdkManager createJdkManager() {
+        Path installPath = JBangJdkProvider.getJBangJdkDir();
+        Path cachePath = cachePath();
+        JdkDiscovery.Config cfg = new JdkDiscovery.Config(installPath, cachePath, null);
+        cfg.properties()
+                .put("link", JBangJdkProvider.getJBangConfigDir().resolve("currentjdk").toString());
+        return JdkManager.builder().providers(JdkProviders.instance().all(cfg)).build();
+    }
+
+    private static Path cachePath() {
+        String cachePath = System.getenv("JVM_CACHE");
+        Path cacheDir = null;
+        if (cachePath == null) {
+            cachePath = System.getProperty("jvm.cache");
+            if (cachePath != null) {
+                cacheDir = Paths.get(cachePath);
+            } else {
+                cacheDir = Paths.get(System.getProperty("user.home"), ".cache", "jvm");
+            }
+        }
+        return cacheDir;
+    }
+
     static CommandLine.IExecutionExceptionHandler errorHandler =
             (ex, commandLine, parseResult) -> {
                 System.err.println("Error: " + ex.getMessage());