[MNG-8151] Merge DependencyCollector into DependencyResolver

olamy · Jun 11, 2024 · 5d139bd · 5d139bd
1 parent 7161cfa
commit 5d139bd
Show file tree

Hide file tree

Showing 18 changed files with 621 additions and 837 deletions.
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Node.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Node.java
@@ -33,7 33,7 @@
  * Represents a dependency node within a Maven project's dependency collector.
  *
  * @since 4.0.0
- * @see org.apache.maven.api.services.DependencyCollectorResult#getRoot()
  * @see org.apache.maven.api.services.DependencyResolverResult#getRoot()
  */
 @Experimental
 @Immutable

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java
@@ -496,25 496,25 @@ Artifact createArtifact(
  boolean isVersionSnapshot(@Nonnull String version);
 
  /**
- * Shortcut for {@code getService(DependencyCollector.class).collect(...)}
  * Shortcut for {@code getService(DependencyResolver.class).collect(...)}
  *
  * @param artifact artifact for which to get the dependencies, including transitive ones
  * @return root node of the dependency graph for the given artifact
  *
- * @see org.apache.maven.api.services.DependencyCollector#collect(Session, Artifact)
- * @throws org.apache.maven.api.services.DependencyCollectorException if the dependency collection failed
  * @see org.apache.maven.api.services.DependencyResolver#collect(Session, Artifact)
  * @throws org.apache.maven.api.services.DependencyResolverException if the dependency collection failed
  */
  @Nonnull
  Node collectDependencies(@Nonnull Artifact artifact);
 
  /**
- * Shortcut for {@code getService(DependencyCollector.class).collect(...)}
  * Shortcut for {@code getService(DependencyResolver.class).collect(...)}
  *
  * @param project project for which to get the dependencies, including transitive ones
  * @return root node of the dependency graph for the given project
  *
- * @see org.apache.maven.api.services.DependencyCollector#collect(Session, Project)
- * @throws org.apache.maven.api.services.DependencyCollectorException if the dependency collection failed
  * @see org.apache.maven.api.services.DependencyResolver#collect(Session, Project)
  * @throws org.apache.maven.api.services.DependencyResolverException if the dependency collection failed
  */
  @Nonnull
  Node collectDependencies(@Nonnull Project project);
@@ -524,13 524,13 @@ Artifact createArtifact(
  * only concerned about determining the coordinates of the transitive dependencies and does not actually resolve the
  * artifact files.
  * <p>
- * Shortcut for {@code getService(DependencyCollector.class).resolve(...)}
  * Shortcut for {@code getService(DependencyResolver.class).resolve(...)}
  *
  * @param dependency dependency for which to get transitive dependencies
  * @return root node of the dependency graph for the given artifact
  *
- * @see org.apache.maven.api.services.DependencyCollector#collect(Session, DependencyCoordinate)
- * @throws org.apache.maven.api.services.DependencyCollectorException if the dependency collection failed
  * @see org.apache.maven.api.services.DependencyResolver#collect(Session, DependencyCoordinate)
  * @throws org.apache.maven.api.services.DependencyResolverException if the dependency collection failed
  */
  @Nonnull
  Node collectDependencies(@Nonnull DependencyCoordinate dependency);

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollector.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollector.java
diff --git a/...en-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorException.java b/...en-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorException.java