Use ConcurrentReferenceHashMap

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.1.1
+* Improve performance by using `ConcurrentReferenceHashMap` instead of `synchronized`
+
 # 1.1.0
 * Update PMD to 7.24.0
 * Dropped support for IntelliJ IDEA < 261 to fix deprecations

src/main/java/net/sourceforge/pmd/cache/internal/ZipFileFingerprinter.java

@@ -12,7 +12,6 @@
 import java.nio.ByteBuffer;
 import java.nio.file.NoSuchFileException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.List;
@@ -25,7 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import software.xdev.pmd.external.org.apache.shiro.lang.util.SoftHashMap;
+import software.xdev.pmd.external.org.springframework.util.ConcurrentReferenceHashMap;
 
 
 /**
@@ -37,9 +36,7 @@
 public class ZipFileFingerprinter implements ClasspathEntryFingerprinter
 {
 	// IMPROVED
-	private static final Map<String, UrlCachedPayload> FILE_CRC_CHECKSUMS_CACHE =
-		Collections.synchronizedMap(new SoftHashMap<>());
-	
+	private static final Map<String, UrlCachedPayload> FILE_CRC_CHECKSUMS_CACHE = new ConcurrentReferenceHashMap<>();
 
 	record UrlCachedPayload(
 		long length,

src/main/java/net/sourceforge/pmd/lang/rule/xpath/internal/SaxonXPathRuleQuery.java

@@ -5,14 +5,12 @@
 package net.sourceforge.pmd.lang.rule.xpath.internal;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.WeakHashMap;
 
 import org.apache.commons.lang3.exception.ContextedRuntimeException;
 import org.slf4j.Logger;
@@ -45,6 +43,7 @@
 import net.sourceforge.pmd.properties.PropertyDescriptor;
 import net.sourceforge.pmd.util.DataMap;
 import net.sourceforge.pmd.util.DataMap.SimpleDataKey;
+import software.xdev.pmd.external.org.springframework.util.ConcurrentReferenceHashMap;
 
 
 /**
@@ -57,8 +56,8 @@ public class SaxonXPathRuleQuery
 {
 	// IMPROVED
 	// Different XPathHandlers have different extensions (e.g. pmd-java) that are registered with configuration
-	private static Map<XPathHandler, CachedInitData> cachedInitData = Collections.synchronizedMap(new WeakHashMap<>());
-	
+	private static Map<XPathHandler, CachedInitData> cachedInitData = new ConcurrentReferenceHashMap<>(
+		ConcurrentReferenceHashMap.ReferenceType.WEAK);
 
 	record CachedInitData(
 		Configuration configuration,

src/main/java/software/xdev/pmd/analysis/PMDAnalyzer.java

@@ -6,14 +6,13 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -46,7 +45,7 @@
 import net.sourceforge.pmd.reporting.Report;
 import software.xdev.pmd.config.PluginConfiguration;
 import software.xdev.pmd.config.PluginConfigurationManager;
-import software.xdev.pmd.external.org.apache.shiro.lang.util.SoftHashMap;
+import software.xdev.pmd.external.org.springframework.util.ConcurrentReferenceHashMap;
 import software.xdev.pmd.langversion.ManagedLanguageVersionResolver;
 import software.xdev.pmd.model.config.ConfigurationLocation;
 
@@ -61,11 +60,11 @@ public class PMDAnalyzer implements Disposable
 
 	private final Project project;
 
-	private final Map<Optional<Module>, ReentrantLock> locks = Collections.synchronizedMap(new HashMap<>());
-	private final Map<Optional<Module>, CacheFile> cacheFiles = Collections.synchronizedMap(new HashMap<>());
+	private final Map<Optional<Module>, ReentrantLock> locks = new ConcurrentHashMap<>();
+	private final Map<Optional<Module>, CacheFile> cacheFiles = new ConcurrentHashMap<>();
 	// Reuse classloader when path is the same
 	private final Map<Set<String>, ClassLoader> cachedSdkLibAuxClassLoader =
-		Collections.synchronizedMap(new SoftHashMap<>());
+		new ConcurrentReferenceHashMap<>();
 
 	public PMDAnalyzer(final Project project)
 	{

src/main/java/software/xdev/pmd/currentfile/CurrentFileAnalysisManager.java

@@ -2,11 +2,11 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.jetbrains.annotations.NotNull;
@@ -40,7 +40,7 @@ public class CurrentFileAnalysisManager implements FileEditorManagerListener, Di
 	@NotNull
 	private final AtomicReference<PsiFile> currentlySelectedFile = new AtomicReference<>();
 	private final Map<PsiFile, Map<ExternalAnnotator<?, ?>, PMDAnalysisResult>> fileAnalysisResults =
-		Collections.synchronizedMap(new HashMap<>());
+		new ConcurrentHashMap<>();
 
 	public CurrentFileAnalysisManager(@NotNull final Project project)
 	{