Skip to content

[MNG-7294] Refactor MavenSession#getPluginContext to be thread safe #575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cstamas merged 1 commit into from
Oct 9, 2021
Merged

[MNG-7294] Refactor MavenSession#getPluginContext to be thread safe #575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryCache;
Expand Down Expand Up @@ -75,7 +76,13 @@ public class MavenSession

private boolean parallel;

private final Map<String, Map<String, Map<String, Object>>> pluginContextsByProjectAndPluginKey =
/**
* Plugin context keyed by project ({@link MavenProject#getId()}) and by plugin lookup key
* ({@link PluginDescriptor#getPluginLookupKey()}). Plugin contexts itself are mappings of {@link String} keys to
* {@link Object} values.
*/
@SuppressWarnings( "checkstyle:linelength" )
private final ConcurrentMap<String, ConcurrentMap<String, ConcurrentMap<String, Object>>> pluginContextsByProjectAndPluginKey =
new ConcurrentHashMap<>();


Expand Down Expand Up @@ -192,31 +199,25 @@ public MavenExecutionResult getResult()

// Backward compat


/**
* Returns the plugin context for given key ({@link PluginDescriptor#getPluginLookupKey()} and
* {@link MavenProject}, never returns {@code null} as if context not present, creates it.
*
* <strong>Implementation note:</strong> while this method return type is {@link Map}, the returned map instance
* implements {@link ConcurrentMap} as well.
*
*/
public Map<String, Object> getPluginContext( PluginDescriptor plugin, MavenProject project )
{
String projectKey = project.getId();

Map<String, Map<String, Object>> pluginContextsByKey = pluginContextsByProjectAndPluginKey.get( projectKey );

if ( pluginContextsByKey == null )
{
pluginContextsByKey = new ConcurrentHashMap<>();

pluginContextsByProjectAndPluginKey.put( projectKey, pluginContextsByKey );
}
ConcurrentMap<String, ConcurrentMap<String, Object>> pluginContextsByKey = pluginContextsByProjectAndPluginKey
.computeIfAbsent( projectKey, k -> new ConcurrentHashMap<>() );

String pluginKey = plugin.getPluginLookupKey();

Map<String, Object> pluginContext = pluginContextsByKey.get( pluginKey );

if ( pluginContext == null )
{
pluginContext = new ConcurrentHashMap<>();

pluginContextsByKey.put( pluginKey, pluginContext );
}

return pluginContext;
return pluginContextsByKey.computeIfAbsent( pluginKey, k -> new ConcurrentHashMap<>() );
}

public ProjectDependencyGraph getProjectDependencyGraph()
Expand Down