khmarbaise closed pull request #186: better performant for some Collection
operations
URL: https://github.com/apache/maven/pull/186
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
index fb99593c90..9bcc384234 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
@@ -313,12 +313,8 @@ private static void mergePluginExecutionDefinitions(
PluginExecution child, Plug
public static List<Repository> mergeRepositoryLists( List<Repository>
dominant, List<Repository> recessive )
{
- List<Repository> repositories = new ArrayList<>();
- for ( Repository repository : dominant )
- {
- repositories.add( repository );
- }
+ List<Repository> repositories = new ArrayList<>( dominant );
for ( Repository repository : recessive )
{
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
index b6e3c0c96e..f980f5ab47 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
@@ -139,7 +139,7 @@ protected void visit( MetadataGraphVertex node ) // ,
String version, String art
if ( exits != null && exits.size() > 0 )
{
- MetadataGraphEdge[] sortedExits = exits.toArray( new
MetadataGraphEdge[exits.size()] );
+ MetadataGraphEdge[] sortedExits = exits.toArray( new
MetadataGraphEdge[0] );
Arrays.sort( sortedExits
,
new Comparator<MetadataGraphEdge>()
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 2b3108a47f..24b36dda31 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -49,6 +49,7 @@
import org.eclipse.aether.resolution.VersionRangeResolutionException;
import org.eclipse.aether.resolution.VersionRangeResult;
+
/**
* A model resolver to assist building of projects. This resolver gives
priority to those repositories that have been
* declared in the POM.
@@ -91,9 +92,7 @@ public ProjectModelResolver( RepositorySystemSession session,
RequestTrace trace
this.resolver = resolver;
this.remoteRepositoryManager = remoteRepositoryManager;
this.pomRepositories = new ArrayList<>();
- List<RemoteRepository> externalRepositories = new ArrayList<>();
- externalRepositories.addAll( repositories );
- this.externalRepositories = Collections.unmodifiableList(
externalRepositories );
+ this.externalRepositories = Collections.unmodifiableList( new
ArrayList<>( repositories ) );
this.repositories = new ArrayList<>();
this.repositories.addAll( externalRepositories );
this.repositoryMerging = repositoryMerging;
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
index 40db38994d..1591573f62 100644
---
a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
+++
b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
@@ -69,7 +69,7 @@
}
}
- return toRet.toArray( new ToolchainPrivate[toRet.size()] );
+ return toRet.toArray( new ToolchainPrivate[0] );
}
@Override
diff --git
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java
index a8572ffc9f..8a6580b699 100644
---
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java
+++
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java
@@ -50,10 +50,7 @@ public void execute( MavenSession session, MojoExecution
mojoExecution, ProjectI
public void execute( MavenSession session, List<MojoExecution>
mojoExecutions, ProjectIndex projectIndex )
throws LifecycleExecutionException
{
- for ( MojoExecution mojoExecution : mojoExecutions )
- {
- executions.add( mojoExecution );
- }
+ executions.addAll(mojoExecutions);
}
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java
b/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java
index 8b2d9b70ab..08403b649d 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java
@@ -115,7 +115,7 @@
}
else
{
- cleanArgs = cleaned.toArray( new String[cleanedSz] );
+ cleanArgs = cleaned.toArray( new String[0] );
}
return cleanArgs;
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 ca8e040732..196331216b 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
@@ -384,7 +384,7 @@ void cli( CliRequest cliRequest )
}
}
- mavenConfig = cliManager.parse( args.toArray( new
String[args.size()] ) );
+ mavenConfig = cliManager.parse( args.toArray( new String[0] )
);
List<?> unrecongized = mavenConfig.getArgList();
if ( !unrecongized.isEmpty() )
{
@@ -1194,7 +1194,7 @@ else if ( userSuppliedConfigurationProcessorCount > 1 )
sb.append( String.format( "%s\n",
configurationProcessor.getClass().getName() ) );
}
}
- sb.append( String.format( "\n" ) );
+ sb.append( "\n" );
throw new Exception( sb.toString() );
}
}
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
index c95cacbfd7..25982cd6d8 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
@@ -263,9 +263,8 @@ else if ( Map.class.isAssignableFrom( type ) )
fields.add( new ObjectField( currentField ) );
}
}
-
}
- this.fields = fields.toArray( new CacheField[fields.size()] );
+ this.fields = fields.toArray( new CacheField[0] );
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index 6818453469..338f4ff8ad 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -89,9 +89,7 @@
this.versionRangeResolver = versionRangeResolver;
this.remoteRepositoryManager = remoteRepositoryManager;
this.repositories = repositories;
- List<RemoteRepository> externalRepositories = new ArrayList<>();
- externalRepositories.addAll( repositories );
- this.externalRepositories = Collections.unmodifiableList(
externalRepositories );
+ this.externalRepositories = Collections.unmodifiableList( new
ArrayList<>( repositories ) );
this.repositoryIds = new HashSet<>();
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
