Replace Map-based caches with Cache interface throughout Maven #2507
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change brings the implementation closer to the original PR #2506 by replacing Map-based caches with the modern Cache interface throughout the Maven codebase.
Changes Made
1. Removed CacheMapAdapter
2. Updated DefaultRequestCache
Map<Object, CachingSupplier<?, ?>>
toCache<Object, CachingSupplier<?, ?>>
3. Updated AbstractSession
Replaced all Map-based caches with Cache interface:
Map<Class<? extends Service>, Service>
→Cache<Class<? extends Service>, Service>
WeakHashMap<DependencyNode, Node>
→Cache<DependencyNode, Node>
ConcurrentHashMap<Class, Map<Artifact, Artifact>>
→Cache<Class, Cache<Artifact, Artifact>>
WeakHashMap<RemoteRepository, RemoteRepository>
→Cache<RemoteRepository, RemoteRepository>
WeakHashMap<Dependency, Dependency>
→Cache<Dependency, Dependency>
Benefits
Cache<K,V>
consistently as intended in PR Improve Maven cache architecture for better memory efficiency and performance #2506Verification
Scope
This change focuses on the core cache infrastructure in
maven-impl
. Additional cache classes inmaven-core
(likeDefaultPluginRealmCache
,DefaultProjectArtifactsCache
, etc.) can be updated in a separate effort as they require additional methods to be added to the Cache interface.Related