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 1697e7a06ba52f97fe4444ab109b558f3e672b84 Author: Rostislav Krasny <[email protected]> AuthorDate: Wed Jan 22 21:28:58 2020 +0200 [MNG-6855] 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" ); } }
