Add cache for resolved metadata

Srdjan-V · May 17, 2024 · fde5713 · fde5713
1 parent eaea423
commit fde5713
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 7 deletions.
diff --git a/plugin/src/main/java/io/github/srdjanv/hotswapgradle/HotswapGradleService.java b/plugin/src/main/java/io/github/srdjanv/hotswapgradle/HotswapGradleService.java
@@ -2,11 +2,13 @@
 
 import io.github.srdjanv.hotswapgradle.agent.HotswapAgentProvider;
 import io.github.srdjanv.hotswapgradle.registry.ICachedJVMRegistry;
+import io.github.srdjanv.hotswapgradle.registry.IDcevmMetadataCacheRegistry;
 import io.github.srdjanv.hotswapgradle.registry.IKnownDcevmRegistry;
 import io.github.srdjanv.hotswapgradle.registry.ILocalJVMRegistry;
 import io.github.srdjanv.hotswapgradle.registry.internal.CachedJVMRegistry;
 import io.github.srdjanv.hotswapgradle.registry.internal.KnownDcevmRegistry;
 import io.github.srdjanv.hotswapgradle.registry.internal.LocalJVMRegistry;
+import io.github.srdjanv.hotswapgradle.resolver.internal.DefaultDcevmMetadataCacheRegistry;
 import io.github.srdjanv.hotswapgradle.validator.DcevmValidator;
 import java.util.Objects;
 import org.gradle.api.file.DirectoryProperty;
@@ -34,12 +36,14 @@ public interface HotSwapParameters extends BuildServiceParameters {
 
     private DcevmValidator dcevmValidator;
     private final HotswapAgentProvider downloader;
+    private final IDcevmMetadataCacheRegistry dcevmMetadataCacheRegistry;
     private final IKnownDcevmRegistry knownDCEVMRegistry;
     private final ICachedJVMRegistry cashedJVMRegistry;
     private final ILocalJVMRegistry localJVMRegistry;
 
     public HotswapGradleService() {
         dcevmValidator = DcevmValidator.defaultValidator();
+        dcevmMetadataCacheRegistry = new DefaultDcevmMetadataCacheRegistry(this);
         downloader = new HotswapAgentProvider(this);
         knownDCEVMRegistry = new KnownDcevmRegistry(this);
         cashedJVMRegistry = new CachedJVMRegistry(this);
@@ -54,6 +58,10 @@ public DcevmValidator getDcevmValidator() {
         return dcevmValidator;
     }
 
+    public IDcevmMetadataCacheRegistry getDcevmMetadataCacheRegistry() {
+        return dcevmMetadataCacheRegistry;
+    }
+
     public HotswapAgentProvider getAgentProvider() {
         return downloader;
     }

diff --git a/...n/src/main/java/io/github/srdjanv/hotswapgradle/registry/IDcevmMetadataCacheRegistry.java b/...n/src/main/java/io/github/srdjanv/hotswapgradle/registry/IDcevmMetadataCacheRegistry.java
@@ -0,0 +1,9 @@
+package io.github.srdjanv.hotswapgradle.registry;
+
+import io.github.srdjanv.hotswapgradle.dcvm.DcevmMetadata;
+import io.github.srdjanv.hotswapgradle.resolver.IDcevmMetadataResolver;
+import java.nio.file.Path;
+
+public interface IDcevmMetadataCacheRegistry {
+    DcevmMetadata getResolveMetadata(Path javaHome, IDcevmMetadataResolver resolver);
+}
diff --git a/...in/src/main/java/io/github/srdjanv/hotswapgradle/registry/internal/CachedJVMRegistry.java b/...in/src/main/java/io/github/srdjanv/hotswapgradle/registry/internal/CachedJVMRegistry.java
@@ -228,7 +228,7 @@ public void addToRegistry(DcevmMetadata metadata) {
             for (var path : paths) {
                 var iDcevmMetadata = dcevmMetadataCache.get(path);
                 if (iDcevmMetadata == null) {
-                    iDcevmMetadata = metadataResolver.resolveDcevmMetadata(path);
+                    iDcevmMetadata = service.getDcevmMetadataCacheRegistry().getResolveMetadata(path, metadataResolver);
                     if (iDcevmMetadata != null) addToRegistry(iDcevmMetadata);
                 }
                 if (iDcevmMetadata != null) dcevmSpec.getDcevmMetadata().set(iDcevmMetadata);

diff --git a/...n/src/main/java/io/github/srdjanv/hotswapgradle/registry/internal/KnownDcevmRegistry.java b/...n/src/main/java/io/github/srdjanv/hotswapgradle/registry/internal/KnownDcevmRegistry.java
@@ -102,11 +102,14 @@ public void configureRegistry(Consumer<Map<JavaVersion, List<Action<? super Dcev
                     var resolvedLauncher = launcherResolver.resolveLauncher(specPair.getRight());
                     try {
                         javaLauncher = resolvedLauncher.get();
-                        var metadata = metadataResolver.resolveDcevmMetadata(javaLauncher
-                                .getMetadata()
-                                .getInstallationPath()
-                                .getAsFile()
-                                .toPath());
+                        var metadata = service.getDcevmMetadataCacheRegistry()
+                                .getResolveMetadata(
+                                        javaLauncher
+                                                .getMetadata()
+                                                .getInstallationPath()
+                                                .getAsFile()
+                                                .toPath(),
+                                        metadataResolver);
                         if (!metadata.getIsDcevmPresent().get()) {
                             logger.info("Resolved known spec is not an DCEVM, known spec {}", specPair.getRight());
                             javaLauncher = null;

diff --git a/.../io/github/srdjanv/hotswapgradle/resolver/internal/DefaultDcevmMetadataCacheRegistry.java b/.../io/github/srdjanv/hotswapgradle/resolver/internal/DefaultDcevmMetadataCacheRegistry.java
@@ -0,0 +1,23 @@
+package io.github.srdjanv.hotswapgradle.resolver.internal;
+
+import io.github.srdjanv.hotswapgradle.HotswapGradleService;
+import io.github.srdjanv.hotswapgradle.dcvm.DcevmMetadata;
+import io.github.srdjanv.hotswapgradle.registry.IDcevmMetadataCacheRegistry;
+import io.github.srdjanv.hotswapgradle.resolver.IDcevmMetadataResolver;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class DefaultDcevmMetadataCacheRegistry implements IDcevmMetadataCacheRegistry {
+    private final Map<Path, DcevmMetadata> dcevmMetadataCache = new ConcurrentHashMap<>();
+    private final HotswapGradleService service;
+
+    public DefaultDcevmMetadataCacheRegistry(HotswapGradleService service) {
+        this.service = service;
+    }
+
+    @Override
+    public DcevmMetadata getResolveMetadata(Path javaHome, IDcevmMetadataResolver resolver) {
+        return dcevmMetadataCache.computeIfAbsent(javaHome, resolver::resolveDcevmMetadata);
+    }
+}
diff --git a/...n/src/main/java/io/github/srdjanv/hotswapgradle/resolver/internal/DefaultJVMResolver.java b/...n/src/main/java/io/github/srdjanv/hotswapgradle/resolver/internal/DefaultJVMResolver.java
@@ -27,7 +27,8 @@ public List<DcevmMetadata> getAllDcevmToolchains(IDcevmMetadataResolver metadata
         return registry.toolchains().stream()
                 .filter(tool -> tool.metadata.isValidInstallation())
                 .filter(tool -> service.getDcevmValidator().validateDcevm(tool.metadata.getJavaHome()))
-                .map(tool -> metadataResolver.resolveDcevmMetadata(tool.metadata.getJavaHome()))
+                .map(tool -> service.getDcevmMetadataCacheRegistry()
+                        .getResolveMetadata(tool.metadata.getJavaHome(), metadataResolver))
                 .collect(Collectors.toList());
     }
 }