You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/05/11 16:34:56 UTC
[maven-resolver] 03/03: Tidy up demo
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch tmp-collect-listener
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit d730dcd4d7cece3fb1d150879604d87e872cc0dc
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed May 11 18:34:37 2022 +0200
Tidy up demo
---
.../examples/ResolveTransitiveDependencies.java | 7 ++----
.../maven/resolver/examples/util/Booter.java | 4 +--
.../impl/collect/DependencyCollectorDelegate.java | 29 +++++++++++-----------
.../impl/collect/bf/BfDependencyCollector.java | 4 +--
.../impl/collect/df/DfDependencyCollector.java | 4 +--
5 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveTransitiveDependencies.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveTransitiveDependencies.java
index 90df6813..88ee3ec3 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveTransitiveDependencies.java
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveTransitiveDependencies.java
@@ -22,7 +22,6 @@ package org.apache.maven.resolver.examples;
import java.util.List;
import org.apache.maven.resolver.examples.util.Booter;
-import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
@@ -54,17 +53,15 @@ public class ResolveTransitiveDependencies
RepositorySystem system = Booter.newRepositorySystem( Booter.selectFactory( args ) );
- DefaultRepositorySystemSession session = Booter.newRepositorySystemSession( system );
- session.setConfigProperty( "aether.collector.impl", "df" );
+ RepositorySystemSession session = Booter.newRepositorySystemSession( system );
- Artifact artifact = new DefaultArtifact( "org.apache.maven:maven-core:3.8.5" );
+ Artifact artifact = new DefaultArtifact( "org.apache.maven.resolver:maven-resolver-impl:1.3.3" );
DependencyFilter classpathFlter = DependencyFilterUtils.classpathFilter( JavaScopes.COMPILE );
CollectRequest collectRequest = new CollectRequest();
collectRequest.setRoot( new Dependency( artifact, JavaScopes.COMPILE ) );
collectRequest.setRepositories( Booter.newRepositories( system, session ) );
- collectRequest.setRequestContext( "test" );
DependencyRequest dependencyRequest = new DependencyRequest( collectRequest, classpathFlter );
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java
index e20b9bff..399f2f99 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java
@@ -75,8 +75,8 @@ public class Booter
LocalRepository localRepo = new LocalRepository( "target/local-repo" );
session.setLocalRepositoryManager( system.newLocalRepositoryManager( session, localRepo ) );
- //session.setTransferListener( new ConsoleTransferListener() );
- //session.setRepositoryListener( new ConsoleRepositoryListener() );
+ session.setTransferListener( new ConsoleTransferListener() );
+ session.setRepositoryListener( new ConsoleRepositoryListener() );
// uncomment to generate dirty trees
// session.setDependencyGraphTransformer( null );
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java
index d539a21f..485eb4c7 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java
@@ -19,19 +19,17 @@ package org.eclipse.aether.internal.impl.collect;
* under the License.
*/
-import java.util.Collections;
import java.util.List;
import java.util.ListIterator;
+import java.util.stream.Collectors;
import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.impl.ArtifactDescriptorReader;
import org.eclipse.aether.impl.DependencyCollector;
import org.eclipse.aether.impl.RemoteRepositoryManager;
import org.eclipse.aether.impl.VersionRangeResolver;
-import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
-import org.eclipse.aether.resolution.ArtifactDescriptorResult;
+import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.spi.locator.ServiceLocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -103,26 +101,27 @@ public abstract class DependencyCollectorDelegate implements DependencyCollector
}
protected void dependencyCollected( RepositorySystemSession session,
- List<DependencyNode> path,
- Dependency dependency,
- ArtifactDescriptorRequest artifactDescriptorRequest,
- ArtifactDescriptorResult artifactDescriptorResult )
+ List<DependencyNode> pathToCollectedNode,
+ DependencyNode collectedNode )
{
- logger.info(String.format("%s (context: %s) @ %s", dependency, artifactDescriptorRequest.getRequestContext(),
- artifactDescriptorResult != null && artifactDescriptorResult.getRepository() == null ? "unknown" : artifactDescriptorResult.getRepository().getId()));
+ // TODO: this is below "demo", but will be an extension point
+ logger.info( String.format( "%s (context: %s)",
+ collectedNode.getDependency(), collectedNode.getRequestContext() ) );
int distance = 0;
- ListIterator<DependencyNode> reversePathIterator = path.listIterator( path.size() );
+ ListIterator<DependencyNode> reversePathIterator = pathToCollectedNode
+ .listIterator( pathToCollectedNode.size() );
while ( reversePathIterator.hasPrevious() )
{
DependencyNode dn = reversePathIterator.previous();
StringBuilder indent = new StringBuilder();
- for (int i = 0; i < distance; i++) {
- indent.append(" ");
+ for ( int i = 0; i < distance; i++ )
+ {
+ indent.append( " " );
}
distance++;
indent.append( " -> " );
- logger.info(String.format("%s%s (context: %s) @ %s", indent, dn, dn.getRequestContext(),
- artifactDescriptorResult.getRepository() == null ? "unknown" : artifactDescriptorResult.getRepository().getId()));
+ logger.info( String.format( "%s%s (context: %s) @ %s", indent, dn, dn.getRequestContext(),
+ dn.getRepositories().stream().map( RemoteRepository::getId ).collect( Collectors.toList() ) ) );
}
}
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java
index 5119a652..d8ae965e 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java
@@ -446,7 +446,7 @@ public class BfDependencyCollector
descriptorResult.getAliases(), repos, args.request.getRequestContext() );
context.getParent().getChildren().add( child );
- dependencyCollected( args.session, context.parents, d, descriptorRequest, descriptorResult );
+ dependencyCollected( args.session, context.parents, child );
boolean recurse = traverse && !descriptorResult.getDependencies().isEmpty();
DependencyProcessingContext parentContext = context.withDependency( d );
@@ -471,7 +471,7 @@ public class BfDependencyCollector
createDependencyNode( relocations, preManaged, rangeResult, version, d, null, repos,
args.request.getRequestContext() );
context.getParent().getChildren().add( child );
- dependencyCollected( args.session, context.parents, d, descriptorRequest, descriptorResult );
+ dependencyCollected( args.session, context.parents, child );
}
}
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java
index cc430b43..d904ded4 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java
@@ -420,7 +420,7 @@ public class DfDependencyCollector
descriptorResult.getAliases(), repos, args.request.getRequestContext() );
node.getChildren().add( child );
- dependencyCollected( args.session, args.nodes.nodes, d, descriptorRequest, descriptorResult );
+ dependencyCollected( args.session, args.nodes.nodes, child );
boolean recurse = traverse && !descriptorResult.getDependencies().isEmpty();
if ( recurse )
@@ -439,7 +439,7 @@ public class DfDependencyCollector
createDependencyNode( relocations, preManaged, rangeResult, version, d, null, repos,
args.request.getRequestContext() );
node.getChildren().add( child );
- dependencyCollected( args.session, args.nodes.nodes, d, descriptorRequest, descriptorResult );
+ dependencyCollected( args.session, args.nodes.nodes, child );
}
}
}