You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/06/12 21:26:29 UTC
svn commit: r1748052 - in
/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal:
Maven30DependencyResolver.java Maven31DependencyResolver.java
Author: rfscholte
Date: Sun Jun 12 21:26:29 2016
New Revision: 1748052
URL: http://svn.apache.org/viewvc?rev=1748052&view=rev
Log:
Artifact resolution already done, no need to do it twice
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java?rev=1748052&r1=1748051&r2=1748052&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java Sun Jun 12 21:26:29 2016
@@ -198,28 +198,21 @@ public class Maven30DependencyResolver
RepositorySystemSession session =
(RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession" );
- List<ArtifactResult> dependencyResults =
+ final List<ArtifactResult> dependencyResults =
repositorySystem.resolveDependencies( session, request, depFilter );
- Collection<ArtifactRequest> artifactRequests = new ArrayList<ArtifactRequest>( dependencyResults.size() );
-
- for ( ArtifactResult artifactResult : dependencyResults )
- {
- artifactRequests.add( new ArtifactRequest( artifactResult.getArtifact(), aetherRepositories, null ) );
- }
-
- final List<ArtifactResult> artifactResults = repositorySystem.resolveArtifacts( session, artifactRequests );
-
// Keep it lazy! Often artifactsResults aren't used, so transforming up front is too expensive
return new Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>()
{
@Override
public Iterator<org.apache.maven.shared.artifact.resolve.ArtifactResult> iterator()
{
+ // CHECKSTYLE_OFF: LineLength
Collection<org.apache.maven.shared.artifact.resolve.ArtifactResult> artResults =
- new ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>( artifactResults.size() );
-
- for ( ArtifactResult artifactResult : artifactResults )
+ new ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>( dependencyResults.size() );
+ // CHECKSTYLE_ON: LineLength
+
+ for ( ArtifactResult artifactResult : dependencyResults )
{
artResults.add( new Maven30ArtifactResult( artifactResult ) );
}
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java?rev=1748052&r1=1748051&r2=1748052&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java Sun Jun 12 21:26:29 2016
@@ -200,17 +200,7 @@ public class Maven31DependencyResolver
RepositorySystemSession session =
(RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession" );
- DependencyResult dependencyResults = repositorySystem.resolveDependencies( session, depRequest );
-
- Collection<ArtifactRequest> artifactRequests =
- new ArrayList<ArtifactRequest>( dependencyResults.getArtifactResults().size() );
-
- for ( ArtifactResult artifactResult : dependencyResults.getArtifactResults() )
- {
- artifactRequests.add( new ArtifactRequest( artifactResult.getArtifact(), aetherRepositories, null ) );
- }
-
- final List<ArtifactResult> artifactResults = repositorySystem.resolveArtifacts( session, artifactRequests );
+ final DependencyResult dependencyResults = repositorySystem.resolveDependencies( session, depRequest );
// Keep it lazy! Often artifactsResults aren't used, so transforming up front is too expensive
return new Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>()
@@ -220,10 +210,10 @@ public class Maven31DependencyResolver
{
// CHECKSTYLE_OFF: LineLength
Collection<org.apache.maven.shared.artifact.resolve.ArtifactResult> artResults =
- new ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>( artifactResults.size() );
+ new ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>( dependencyResults.getArtifactResults().size() );
// CHECKSTYLE_ON: LineLength
- for ( ArtifactResult artifactResult : artifactResults )
+ for ( ArtifactResult artifactResult : dependencyResults.getArtifactResults() )
{
artResults.add( new Maven31ArtifactResult( artifactResult ) );
}
@@ -232,10 +222,6 @@ public class Maven31DependencyResolver
}
};
}
- catch ( ArtifactResolutionException e )
- {
- throw new DependencyResolverException( e.getMessage(), e );
- }
catch ( DependencyResolutionException e )
{
throw new DependencyResolverException( e.getMessage(), e );