This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MNG-6855 in repository https://gitbox.apache.org/repos/asf/maven.git
commit ace32fdbe00f0d56e80b800bf5fa4196167e6434 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sat Jan 25 21:10:01 2020 +0100 [MNG-6855] Simplify code - computeIfAbsent() --- .../repository/legacy/LegacyRepositorySystem.java | 8 +------- .../maven/repository/metadata/MetadataGraph.java | 14 ++------------ .../src/main/java/org/apache/maven/ReactorReader.java | 8 +------- .../apache/maven/bridge/MavenRepositorySystem.java | 8 +------- .../org/apache/maven/execution/ReactorManager.java | 19 +++---------------- .../internal/DefaultLifecycleMappingDelegate.java | 8 +------- .../java/org/apache/maven/project/ProjectSorter.java | 8 ++------ .../maven/model/building/DefaultModelBuilder.java | 5 +---- 8 files changed, 12 insertions(+), 66 deletions(-) diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java index e3e7781..e4fff06 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java @@ -396,13 +396,7 @@ public class LegacyRepositorySystem { String key = repository.getId(); - List<ArtifactRepository> aliasedRepos = reposByKey.get( key ); - - if ( aliasedRepos == null ) - { - aliasedRepos = new ArrayList<>(); - reposByKey.put( key, aliasedRepos ); - } + List<ArtifactRepository> aliasedRepos = reposByKey.computeIfAbsent( key, k -> new ArrayList<>() ); aliasedRepos.add( repository ); } diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java index 1ae008a..c6ec048 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java @@ -331,24 +331,14 @@ public class MetadataGraph vFrom.setCompareVersion( versionedVertices ); vFrom.setCompareScope( scopedVertices ); - List<MetadataGraphEdge> exList = excidentEdges.get( vFrom ); - if ( exList == null ) - { - exList = new ArrayList<>(); - excidentEdges.put( vFrom, exList ); - } + List<MetadataGraphEdge> exList = excidentEdges.computeIfAbsent( vFrom, k -> new ArrayList<>() ); if ( !exList.contains( e ) ) { exList.add( e ); } - List<MetadataGraphEdge> inList = incidentEdges.get( vTo ); - if ( inList == null ) - { - inList = new ArrayList<>(); - incidentEdges.put( vTo, inList ); - } + List<MetadataGraphEdge> inList = incidentEdges.computeIfAbsent( vTo, k -> new ArrayList<>() ); if ( !inList.contains( e ) ) { diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java index 84662ff..831a4b6 100644 --- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java +++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java @@ -73,13 +73,7 @@ class ReactorReader { String key = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() ); - List<MavenProject> projects = projectsByGA.get( key ); - - if ( projects == null ) - { - projects = new ArrayList<>( 1 ); - projectsByGA.put( key, projects ); - } + List<MavenProject> projects = projectsByGA.computeIfAbsent( key, k -> new ArrayList<>( 1 ) ); projects.add( project ); } diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java index 730b428..d3cb2e4 100644 --- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java @@ -621,13 +621,7 @@ public class MavenRepositorySystem { String key = repository.getId(); - List<ArtifactRepository> aliasedRepos = reposByKey.get( key ); - - if ( aliasedRepos == null ) - { - aliasedRepos = new ArrayList<>(); - reposByKey.put( key, aliasedRepos ); - } + List<ArtifactRepository> aliasedRepos = reposByKey.computeIfAbsent( key, k -> new ArrayList<>() ); aliasedRepos.add( repository ); } diff --git a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java index 6fa5619..1a7f500 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java @@ -70,23 +70,10 @@ public class ReactorManager public Map getPluginContext( PluginDescriptor plugin, MavenProject project ) { - Map<String, Map> pluginContextsByKey = pluginContextsByProjectAndPluginKey.get( project.getId() ); + Map<String, Map> pluginContextsByKey = + pluginContextsByProjectAndPluginKey.computeIfAbsent( project.getId(), k -> new HashMap<>() ); - if ( pluginContextsByKey == null ) - { - pluginContextsByKey = new HashMap<>(); - pluginContextsByProjectAndPluginKey.put( project.getId(), pluginContextsByKey ); - } - - Map pluginContext = pluginContextsByKey.get( plugin.getPluginLookupKey() ); - - if ( pluginContext == null ) - { - pluginContext = new HashMap<>(); - pluginContextsByKey.put( plugin.getPluginLookupKey(), pluginContext ); - } - - return pluginContext; + return pluginContextsByKey.computeIfAbsent( plugin.getPluginLookupKey(), k -> new HashMap<>() ); } public void setFailureBehavior( String failureBehavior ) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java index 1ddee05..892e4f1 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java @@ -149,13 +149,7 @@ public class DefaultLifecycleMappingDelegate private void addMojoExecution( Map<Integer, List<MojoExecution>> phaseBindings, MojoExecution mojoExecution, int priority ) { - List<MojoExecution> mojoExecutions = phaseBindings.get( priority ); - - if ( mojoExecutions == null ) - { - mojoExecutions = new ArrayList<>(); - phaseBindings.put( priority, mojoExecutions ); - } + List<MojoExecution> mojoExecutions = phaseBindings.computeIfAbsent( priority, k -> new ArrayList<>() ); mojoExecutions.add( mojoExecution ); } diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java index e5abded..40cdf1b 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java @@ -99,12 +99,8 @@ public class ProjectSorter String projectKey = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() ); - Map<String, Vertex> vertices = vertexMap.get( projectKey ); - if ( vertices == null ) - { - vertices = new HashMap<>( 2, 1 ); - vertexMap.put( projectKey, vertices ); - } + Map<String, Vertex> vertices = vertexMap.computeIfAbsent( projectKey, k -> new HashMap<>( 2, 1 ) ); + vertices.put( project.getVersion(), dag.addVertex( projectId ) ); } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index dd25d06..6676d3a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -708,10 +708,7 @@ public class DefaultModelBuilder for ( Plugin plugin : mgmt.getPlugins() ) { String key = plugin.getKey(); - if ( managedVersions.get( key ) == null ) - { - managedVersions.put( key, plugin.getVersion() ); - } + managedVersions.computeIfAbsent( key, k -> plugin.getVersion() ); } } }
