diff --git a/resolver/src/main/java/net/evendanan/bazel/mvn/merger/GraphMemoizator.java b/resolver/src/main/java/net/evendanan/bazel/mvn/merger/GraphMemoizator.java index eaa0a21..b3f5e4f 100644 --- a/resolver/src/main/java/net/evendanan/bazel/mvn/merger/GraphMemoizator.java +++ b/resolver/src/main/java/net/evendanan/bazel/mvn/merger/GraphMemoizator.java @@ -1,11 +1,11 @@ package net.evendanan.bazel.mvn.merger; -import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nonnull; public abstract class GraphMemoizator { - private final Map cache = new HashMap<>(); + private final Map cache = new ConcurrentHashMap<>(); @Nonnull protected abstract T calculate(@Nonnull T original); @@ -13,13 +13,7 @@ public abstract class GraphMemoizator { @Nonnull public T map(@Nonnull T original) { final String key = getKeyForObject(original); - if (cache.containsKey(key)) { - return cache.get(key); - } else { - final T revised = calculate(original); - cache.put(key, revised); - return revised; - } + return cache.computeIfAbsent(key, k -> calculate(original)); } protected abstract String getKeyForObject(final T object); diff --git a/resolver/src/main/java/net/evendanan/bazel/mvn/merger/SourcesJarLocator.java b/resolver/src/main/java/net/evendanan/bazel/mvn/merger/SourcesJarLocator.java index 035ec1b..f86a27a 100644 --- a/resolver/src/main/java/net/evendanan/bazel/mvn/merger/SourcesJarLocator.java +++ b/resolver/src/main/java/net/evendanan/bazel/mvn/merger/SourcesJarLocator.java @@ -5,9 +5,9 @@ import java.net.HttpURLConnection; import java.net.URL; import java.util.Collection; -import java.util.HashMap; import java.util.Locale; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import javax.annotation.Nonnull; import net.evendanan.bazel.mvn.api.DependencyTools; @@ -18,7 +18,7 @@ public class SourcesJarLocator { private static final String SOURCES_CLASSIFIER = "sources"; private final ConnectionFactory mConnectionFactory; - private final Map mURLCache = new HashMap<>(); + private final Map mURLCache = new ConcurrentHashMap<>(); public SourcesJarLocator() { this(url -> (HttpURLConnection) url.openConnection()); @@ -31,7 +31,7 @@ public SourcesJarLocator() { private static Collection fillSourcesAttribute( Collection dependencies, DependencyMemoizator memoizator) { - return dependencies.stream().map(memoizator::map).collect(Collectors.toList()); + return dependencies.parallelStream().map(memoizator::map).collect(Collectors.toList()); } public Collection fillSourcesAttribute(Collection dependencies) {