You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/01/25 23:54:50 UTC
[maven] branch simplify_code created (now aa7a6ab)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch simplify_code
in repository https://gitbox.apache.org/repos/asf/maven.git.
at aa7a6ab Remove redundant code
This branch includes the following new commits:
new b002b9a (doc) Simplify code
new e40aa12 Simplify code - computeIfAbsent()
new c3b2634 Simplify some code
new aa7a6ab Remove redundant code
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 04/04: Remove redundant code
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch simplify_code
in repository https://gitbox.apache.org/repos/asf/maven.git
commit aa7a6ab13656e27627cb133fc274d7db7fee844d
Author: thelproad <th...@outlook.com>
AuthorDate: Sat Aug 17 17:04:15 2019 +0800
Remove redundant code
Closes #280
---
.../artifact/repository/metadata/AbstractRepositoryMetadata.java | 3 +--
.../java/org/apache/maven/classrealm/DefaultClassRealmManager.java | 5 ++---
.../org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java | 2 +-
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 4 ++--
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
index 46c41b9..196b4b7 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
@@ -123,8 +123,7 @@ public abstract class AbstractRepositoryMetadata
// beware meta-versions!
String version = metadata.getVersion();
- if ( version != null && ( Artifact.LATEST_VERSION.equals( version ) || Artifact.RELEASE_VERSION.equals(
- version ) ) )
+ if ( Artifact.LATEST_VERSION.equals( version ) || Artifact.RELEASE_VERSION.equals( version ) )
{
// meta-versions are not valid <version/> values...don't write them.
metadata.setVersion( null );
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index a4835fd..cf3d746 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -243,12 +243,11 @@ public class DefaultClassRealmManager
{
Objects.requireNonNull( plugin, "plugin cannot be null" );
- ClassLoader parent = PARENT_CLASSLOADER;
-
Map<String, ClassLoader> foreignImports =
Collections.<String, ClassLoader>singletonMap( "", getMavenApiRealm() );
- return createRealm( getKey( plugin, true ), RealmType.Extension, parent, null, foreignImports, artifacts );
+ return createRealm( getKey( plugin, true ), RealmType.Extension, PARENT_CLASSLOADER, null,
+ foreignImports, artifacts );
}
private boolean isProvidedArtifact( Artifact artifact )
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
index edb8dce..4bafa30 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
@@ -190,7 +190,7 @@ public class MojoDescriptorCreator
plugin.setArtifactId( tok.nextToken() );
goal = tok.nextToken();
}
- else if ( numTokens <= 2 )
+ else
{
// We have a prefix and goal
//
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 5ca0602..79e1ffe 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -337,7 +337,7 @@ public class MavenCli
"-D%s system property is not set.", MULTIMODULE_PROJECT_DIRECTORY );
throw new ExitException( 1 );
}
- File basedir = basedirProperty != null ? new File( basedirProperty ) : new File( "" );
+ File basedir = new File( basedirProperty );
try
{
cliRequest.multiModuleProjectDirectory = basedir.getCanonicalFile();
@@ -764,7 +764,7 @@ public class MavenCli
MavenExecutionRequest request = DefaultMavenExecutionRequest.copy( cliRequest.request );
- request = populateRequest( cliRequest, request );
+ populateRequest( cliRequest, request );
request = executionRequestPopulator.populateDefaults( request );
[maven] 03/04: Simplify some code
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch simplify_code
in repository https://gitbox.apache.org/repos/asf/maven.git
commit c3b26347b196e428d05904356615bdc787058a00
Author: Lipmanpoi <ch...@foxmal.com>
AuthorDate: Sat Aug 17 01:44:56 2019 +0800
Simplify some code
Closes #279
---
.../plugin/version/PluginVersionResolutionException.java | 12 ++++++------
.../org/apache/maven/repository/ArtifactTransferEvent.java | 6 +-----
.../maven/cli/transfer/AbstractMavenTransferListener.java | 2 +-
.../org/apache/maven/model/building/DefaultModelBuilder.java | 8 ++++----
4 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
index dd14b30..c1b5ccf 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
@@ -82,29 +82,29 @@ public class PluginVersionResolutionException
private static String format( LocalRepository localRepository, List<RemoteRepository> remoteRepositories )
{
- String repos = "[";
+ StringBuilder repos = new StringBuilder( "[" );
if ( localRepository != null )
{
- repos += localRepository.getId() + " (" + localRepository.getBasedir() + ")";
+ repos.append( localRepository.getId() ).append( " (" ).append( localRepository.getBasedir() ).append( ")" );
}
if ( remoteRepositories != null && !remoteRepositories.isEmpty() )
{
for ( RemoteRepository repository : remoteRepositories )
{
- repos += ", ";
+ repos.append( ", " );
if ( repository != null )
{
- repos += repository.getId() + " (" + repository.getUrl() + ")";
+ repos.append( repository.getId() ).append( " (" ).append( repository.getUrl() ).append( ")" );
}
}
}
- repos += "]";
+ repos.append( "]" );
- return repos;
+ return repos.toString();
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
index c8150ec..2b28a06 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
@@ -330,11 +330,7 @@ public class ArtifactTransferEvent
{
return false;
}
- else if ( !source.equals( other.source ) )
- {
- return false;
- }
- return true;
+ else return source.equals(other.source);
}
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
index 984902e..72bffc3 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
@@ -192,7 +192,7 @@ public abstract class AbstractMavenTransferListener
public String formatProgress( long progressedSize, long size )
{
Validate.isTrue( progressedSize >= 0L, "progressed file size cannot be negative: %s", progressedSize );
- Validate.isTrue( size >= 0L && progressedSize <= size || size < 0L,
+ Validate.isTrue( size < 0L || progressedSize <= size,
"progressed file size cannot be greater than size: %s > %s", progressedSize, size );
if ( size >= 0L && progressedSize != size )
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 6676d3a..2d01e126 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
@@ -360,15 +360,15 @@ public class DefaultModelBuilder
}
else if ( !parentIds.add( parentData.getId() ) )
{
- String message = "The parents form a cycle: ";
+ StringBuilder message = new StringBuilder( "The parents form a cycle: " );
for ( String modelId : parentIds )
{
- message += modelId + " -> ";
+ message.append( modelId ).append( " -> " );
}
- message += parentData.getId();
+ message.append( parentData.getId() );
problems.add( new ModelProblemCollectorRequest( ModelProblem.Severity.FATAL, ModelProblem.Version.BASE )
- .setMessage( message ) );
+ .setMessage( message.toString() ) );
throw problems.newModelBuildingException();
}
[maven] 02/04: Simplify code - computeIfAbsent()
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch simplify_code
in repository https://gitbox.apache.org/repos/asf/maven.git
commit e40aa1211627899e12e236f67b26f55a7a12d78f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jan 25 21:10:01 2020 +0100
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() );
}
}
}
[maven] 01/04: (doc) Simplify code
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch simplify_code
in repository https://gitbox.apache.org/repos/asf/maven.git
commit b002b9a8407163e84b89c2863bb2ceb2ece1803d
Author: Rostislav Krasny <45...@users.noreply.github.com>
AuthorDate: Wed Jan 22 21:28:58 2020 +0200
(doc) Simplify code
- use Integer/Long.compare()
- use List.removeIf()
- remove unused imports
- redundant .toString()
Closes #319
---
.../maven/artifact/versioning/ComparableVersion.java | 6 +++---
.../apache/maven/repository/legacy/StringWagon.java | 1 -
.../resolver/DefaultArtifactCollectorTest.java | 20 +++++++-------------
.../plugin/internal/DefaultMavenPluginManager.java | 10 +---------
.../internal/PluginDependencyResolutionListener.java | 10 +---------
.../maven/lifecycle/internal/BuilderCommonTest.java | 1 -
.../maven/model/building/DefaultModelBuilder.java | 4 ++--
.../main/java/org/slf4j/impl/MavenSimpleLogger.java | 10 +++++-----
8 files changed, 19 insertions(+), 43 deletions(-)
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 811bab2..987be48 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -132,7 +132,7 @@ public class ComparableVersion
{
case INT_ITEM:
int itemValue = ( (IntItem) item ).value;
- return ( value < itemValue ) ? -1 : ( ( value == itemValue ) ? 0 : 1 );
+ return Integer.compare( value, itemValue );
case LONG_ITEM:
case BIGINTEGER_ITEM:
return -1;
@@ -218,7 +218,7 @@ public class ComparableVersion
return 1;
case LONG_ITEM:
long itemValue = ( (LongItem) item ).value;
- return ( value < itemValue ) ? -1 : ( ( value == itemValue ) ? 0 : 1 );
+ return Long.compare( value, itemValue );
case BIGINTEGER_ITEM:
return -1;
@@ -787,7 +787,7 @@ public class ComparableVersion
+ ( ( compare == 0 ) ? "==" : ( ( compare < 0 ) ? "<" : ">" ) ) + ' ' + version );
}
- System.out.println( String.valueOf( i++ ) + ". " + version + " == " + c.getCanonical() );
+ System.out.println( ( i++ ) + ". " + version + " == " + c.getCanonical() );
prev = c;
}
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
index 3a72b98..fde759e 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
@@ -21,7 +21,6 @@ package org.apache.maven.repository.legacy;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
index 391ec0f..3f3a926 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
@@ -28,7 +28,6 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.CyclicDependencyException;
-import org.apache.maven.artifact.resolver.ResolutionListener;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
@@ -740,29 +739,29 @@ public class DefaultArtifactCollectorTest
throws ArtifactResolutionException
{
return artifactCollector.collect( artifacts, projectArtifact.artifact, null, null, null, source, filter,
- Collections.<ResolutionListener>emptyList(), null );
+ Collections.emptyList(), null );
}
private ArtifactResolutionResult collect( ArtifactSpec a )
throws ArtifactResolutionException
{
return artifactCollector.collect( Collections.singleton( a.artifact ), projectArtifact.artifact, null, null,
- null, source, null, Collections.<ResolutionListener>emptyList(), null );
+ null, source, null, Collections.emptyList(), null );
}
private ArtifactResolutionResult collect( ArtifactSpec a, ArtifactFilter filter )
throws ArtifactResolutionException
{
return artifactCollector.collect( Collections.singleton( a.artifact ), projectArtifact.artifact, null, null,
- null, source, filter, Collections.<ResolutionListener>emptyList(), null );
+ null, source, filter, Collections.emptyList(), null );
}
private ArtifactResolutionResult collect( ArtifactSpec a, Artifact managedVersion )
throws ArtifactResolutionException
{
- Map managedVersions = Collections.singletonMap( managedVersion.getDependencyConflictId(), managedVersion );
+ Map<String, Artifact> managedVersions = Collections.singletonMap( managedVersion.getDependencyConflictId(), managedVersion );
return artifactCollector.collect( Collections.singleton( a.artifact ), projectArtifact.artifact,
- managedVersions, null, null, source, null, Collections.<ResolutionListener>emptyList(), null );
+ managedVersions, null, null, source, null, Collections.emptyList(), null );
}
private ArtifactSpec createArtifactSpec( String id, String version )
@@ -868,7 +867,7 @@ public class DefaultArtifactCollectorTest
return new ResolutionGroup( artifact, createArtifacts( artifactFactory, a.dependencies,
artifact.getScope(),
artifact.getDependencyFilter() ),
- Collections.EMPTY_LIST );
+ Collections.emptyList() );
}
catch ( InvalidVersionSpecificationException e )
{
@@ -930,12 +929,7 @@ public class DefaultArtifactCollectorTest
artifacts.put( getKey( spec.artifact ), spec );
String key = spec.artifact.getDependencyConflictId();
- List<ArtifactVersion> artifactVersions = versions.get( key );
- if ( artifactVersions == null )
- {
- artifactVersions = new ArrayList<>();
- versions.put( key, artifactVersions );
- }
+ List<ArtifactVersion> artifactVersions = versions.computeIfAbsent( key, k -> new ArrayList<>() );
if ( spec.artifact.getVersion() != null )
{
artifactVersions.add( new DefaultArtifactVersion( spec.artifact.getVersion() ) );
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 8630471..9febd4a 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -100,7 +100,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -453,14 +452,7 @@ public class DefaultMavenPluginManager
{
List<Artifact> artifacts = new ArrayList<>( nlg.getNodes().size() );
RepositoryUtils.toArtifacts( artifacts, Collections.singleton( root ), Collections.<String>emptyList(), null );
- for ( Iterator<Artifact> it = artifacts.iterator(); it.hasNext(); )
- {
- Artifact artifact = it.next();
- if ( artifact.getFile() == null )
- {
- it.remove();
- }
- }
+ artifacts.removeIf( artifact -> artifact.getFile() == null );
return Collections.unmodifiableList( artifacts );
}
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
index 47728ec..42eb80e 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.internal;
import java.util.Collection;
import java.util.IdentityHashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
@@ -61,14 +60,7 @@ class PluginDependencyResolutionListener
{
if ( !bannedArtifacts.isEmpty() && artifacts != null )
{
- for ( Iterator<Artifact> it = artifacts.iterator(); it.hasNext(); )
- {
- Artifact artifact = it.next();
- if ( bannedArtifacts.containsKey( artifact ) )
- {
- it.remove();
- }
- }
+ artifacts.removeIf( artifact -> bannedArtifacts.containsKey( artifact ) );
}
}
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java
index 02fd595..f924f52 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java
@@ -17,7 +17,6 @@ package org.apache.maven.lifecycle.internal;
import junit.framework.TestCase;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.MavenExecutionPlan;
import org.apache.maven.lifecycle.internal.builder.BuilderCommon;
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 e341086..dd25d06 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
@@ -924,7 +924,7 @@ public class DefaultModelBuilder
catch ( UnresolvableModelException e )
{
problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE ) //
- .setMessage( e.getMessage().toString() ).setLocation( parent.getLocation( "" ) ).setException( e ) );
+ .setMessage( e.getMessage() ).setLocation( parent.getLocation( "" ) ).setException( e ) );
throw problems.newModelBuildingException();
}
if ( candidateModel == null )
@@ -1251,7 +1251,7 @@ public class DefaultModelBuilder
catch ( UnresolvableModelException e )
{
problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE )
- .setMessage( e.getMessage().toString() ).setException( e ) );
+ .setMessage( e.getMessage() ).setException( e ) );
continue;
}
}
diff --git a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
index 767220d..2b1637c 100644
--- a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
@@ -43,16 +43,16 @@ public class MavenSimpleLogger extends SimpleLogger
switch ( level )
{
case LOG_LEVEL_TRACE:
- return level().debug( "TRACE" ).toString();
+ return level().debug( "TRACE" );
case LOG_LEVEL_DEBUG:
- return level().debug( "DEBUG" ).toString();
+ return level().debug( "DEBUG" );
case LOG_LEVEL_INFO:
- return level().info( "INFO" ).toString();
+ return level().info( "INFO" );
case LOG_LEVEL_WARN:
- return level().warning( "WARNING" ).toString();
+ return level().warning( "WARNING" );
case LOG_LEVEL_ERROR:
default:
- return level().error( "ERROR" ).toString();
+ return level().error( "ERROR" );
}
}