You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/07/06 18:26:29 UTC
[maven] 01/01: [MNG-6698] Lazily compute the ManagedVersionMap
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6698
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 46f9007581255a4bbdfadaad53ef77c8631c6004
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jun 28 23:34:24 2019 +0200
[MNG-6698] Lazily compute the ManagedVersionMap
This map is not used by Maven and the computation can be quite heavy, so lazily
compute it. In addition, do not clone the map, as it's an unmodifiable one already.
This closes #266
---
.../maven/project/DefaultProjectBuilder.java | 66 +++++++++++++++++++---
.../org/apache/maven/project/MavenProject.java | 2 +-
2 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 4309688..c6de1e1 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -21,8 +21,10 @@ package org.apache.maven.project;
import java.io.File;
import java.io.IOException;
+import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -780,21 +782,69 @@ public class DefaultProjectBuilder
Map<String, Artifact> map = null;
if ( repositorySystem != null )
{
- DependencyManagement dependencyManagement = project.getDependencyManagement();
+ final DependencyManagement dependencyManagement = project.getDependencyManagement();
if ( ( dependencyManagement != null ) && ( ( dependencyManagement.getDependencies() ) != null )
&& ( dependencyManagement.getDependencies().size() > 0 ) )
{
- map = new HashMap<>();
- for ( Dependency d : dependencyManagement.getDependencies() )
+ map = new AbstractMap<>()
{
- Artifact artifact = repositorySystem.createDependencyArtifact( d );
+ HashMap<String, Artifact> delegate;
- if ( artifact != null )
+ @Override
+ public Set<Entry<String, Artifact>> entrySet()
{
- map.put( d.getManagementKey(), artifact );
+ return Collections.unmodifiableSet( compute().entrySet() );
}
- }
- map = Collections.unmodifiableMap( map );
+
+ @Override
+ public Set<String> keySet()
+ {
+ return Collections.unmodifiableSet( compute().keySet() );
+ }
+
+ @Override
+ public Collection<Artifact> values()
+ {
+ return Collections.unmodifiableCollection( compute().values() );
+ }
+
+ @Override
+ public boolean containsValue( Object value )
+ {
+ return compute().containsValue( value );
+ }
+
+ @Override
+ public boolean containsKey( Object key )
+ {
+ return compute().containsKey( key );
+ }
+
+ @Override
+ public Artifact get( Object key )
+ {
+ return compute().get( key );
+ }
+
+ HashMap<String, Artifact> compute()
+ {
+ if ( delegate == null )
+ {
+ delegate = new HashMap<>();
+ for ( Dependency d : dependencyManagement.getDependencies() )
+ {
+ Artifact artifact = repositorySystem.createDependencyArtifact( d );
+
+ if ( artifact != null )
+ {
+ delegate.put( d.getManagementKey(), artifact );
+ }
+ }
+ }
+
+ return delegate;
+ }
+ };
}
else
{
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index fd02557..eb7a2df 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -1300,7 +1300,7 @@ public class MavenProject
if ( project.getManagedVersionMap() != null )
{
- setManagedVersionMap( new HashMap<>( project.getManagedVersionMap() ) );
+ setManagedVersionMap( project.getManagedVersionMap() );
}
lifecyclePhases.addAll( project.lifecyclePhases );