Move the recently added Project methods into ProjectManager.

Author: desruisseaux

api/maven-api-core/src/main/java/org/apache/maven/api/Project.java

@@ -19,10 +19,8 @@
 package org.apache.maven.api;
 
 import java.nio.file.Path;
-import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Stream;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
@@ -239,32 +237,4 @@ default String getId() {
      */
     @Nonnull
     Optional<Project> getParent();
-
-    /**
-     * {@return all source root directories}, including the disabled ones, for all languages and scopes.
-     * For listing only the {@linkplain SourceRoot#enabled() enabled} source roots,
-     * the following code can be used:
-     *
-     * <pre>{@literal
-     * List<SourceRoot> enabledRoots = project.getSourceRoots()
-     *         .stream().filter(SourceRoot::enabled).toList();
-     * }</pre>
-     *
-     * The iteration order is the order in which the sources are declared in the POM file.
-     */
-    @Nonnull
-    Collection<SourceRoot> getSourceRoots();
-
-    /**
-     * {@return all enabled sources that provide files in the given language for the given scope}.
-     * If the given scope is {@code null}, then this method returns the enabled sources for all scopes.
-     * If the given language is {@code null}, then this method returns the enabled sources for all languages.
-     * An arbitrary number of source roots may exist for the same scope and language.
-     * It may be, for example, the case of a multi-versions project.
-     * The iteration order is the order in which the sources are declared in the POM file.
-     *
-     * @param scope the scope of the sources to return, or {@code null} for all scopes
-     * @param language the language of the sources to return, or {@code null} for all languages
-     */
-    Stream<SourceRoot> getEnabledSourceRoots(ProjectScope scope, Language language);
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java

@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.Language;
@@ -103,6 +104,7 @@ default void attachArtifact(@Nonnull Session session, @Nonnull Project project,
      * @param type the type of the artifact (e.g., "jar", "war", "sources")
      * @param path the path to the artifact file
      * @throws IllegalArgumentException if the session, project, type or path is null
+     *
      * @see org.apache.maven.api.Type
      */
     default void attachArtifact(
@@ -123,6 +125,37 @@ default void attachArtifact(
      */
     void attachArtifact(@Nonnull Project project, @Nonnull ProducedArtifact artifact, @Nonnull Path path);
 
+    /**
+     * {@return all source root directories}, including the disabled ones, for all languages and scopes.
+     * For listing only the {@linkplain SourceRoot#enabled() enabled} source roots,
+     * the following code can be used:
+     *
+     * <pre>{@literal
+     * List<SourceRoot> enabledRoots = project.getSourceRoots()
+     *         .stream().filter(SourceRoot::enabled).toList();
+     * }</pre>
+     *
+     * The iteration order is the order in which the sources are declared in the POM file.
+     *
+     * @param project the project for which to get the source roots
+     */
+    @Nonnull
+    Collection<SourceRoot> getSourceRoots(@Nonnull Project project);
+
+    /**
+     * {@return all enabled sources that provide files in the given language for the given scope}.
+     * If the given scope is {@code null}, then this method returns the enabled sources for all scopes.
+     * If the given language is {@code null}, then this method returns the enabled sources for all languages.
+     * An arbitrary number of source roots may exist for the same scope and language.
+     * It may be, for example, the case of a multi-versions project.
+     * The iteration order is the order in which the sources are declared in the POM file.
+     *
+     * @param project the project for which to get the enabled source roots
+     * @param scope the scope of the sources to return, or {@code null} for all scopes
+     * @param language the language of the sources to return, or {@code null} for all languages
+     */
+    Stream<SourceRoot> getEnabledSourceRoots(@Nonnull Project project, ProjectScope scope, Language language);
+
     /**
      * Adds the given source to the given project.
      * If a source already exists for the given scope, language and directory,
@@ -133,7 +166,7 @@ default void attachArtifact(
      * @param source the source to add
      * @throws IllegalArgumentException if this project manager rejects the given source because of conflict
      *
-     * @see Project#getSourceRoots()
+     * @see #getSourceRoots(Project)
      */
     void addSourceRoot(@Nonnull Project project, @Nonnull SourceRoot source);
 
@@ -150,7 +183,7 @@ default void attachArtifact(
      * @param language language of the files contained in the directory to add
      * @param directory the directory to add if not already present in the source
      *
-     * @see Project#getEnabledSourceRoots(ProjectScope, Language)
+     * @see #getEnabledSourceRoots(Project, ProjectScope, Language)
      */
     void addSourceRoot(
             @Nonnull Project project, @Nonnull ProjectScope scope, @Nonnull Language language, @Nonnull Path directory);
@@ -174,6 +207,8 @@ void addSourceRoot(
     /**
      * {@return an immutable map of the project properties}.
      *
+     * @param project the project for which to get the properties
+     *
      * @see #setProperty(Project, String, String)
      */
     @Nonnull

impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java

@@ -24,18 +24,14 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Stream;
 
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.api.DependencyCoordinates;
 import org.apache.maven.api.DependencyScope;
 import org.apache.maven.api.Exclusion;
-import org.apache.maven.api.Language;
 import org.apache.maven.api.Packaging;
 import org.apache.maven.api.ProducedArtifact;
 import org.apache.maven.api.Project;
-import org.apache.maven.api.ProjectScope;
-import org.apache.maven.api.SourceRoot;
 import org.apache.maven.api.Type;
 import org.apache.maven.api.VersionConstraint;
 import org.apache.maven.api.annotations.Nonnull;
@@ -169,18 +165,6 @@ public Optional<Project> getParent() {
         return Optional.ofNullable(session.getProject(parent));
     }
 
-    @Nonnull
-    @Override
-    public Collection<SourceRoot> getSourceRoots() {
-        return project.getSourceRoots();
-    }
-
-    @Nonnull
-    @Override
-    public Stream<SourceRoot> getEnabledSourceRoots(ProjectScope scope, Language language) {
-        return project.getEnabledSourceRoots(scope, language);
-    }
-
     @Nonnull
     private DependencyCoordinates toDependency(org.apache.maven.api.model.Dependency dependency) {
         return new DependencyCoordinates() {

impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java

@@ -30,6 +30,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
+import java.util.stream.Stream;
 
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.api.Language;
@@ -126,6 +127,20 @@ public void attachArtifact(Project project, ProducedArtifact artifact, Path path
         artifactManager.setPath(artifact, path);
     }
 
+    @Nonnull
+    @Override
+    public Collection<SourceRoot> getSourceRoots(Project project) {
+        MavenProject prj = getMavenProject(nonNull(project, "project"));
+        return prj.getSourceRoots();
+    }
+
+    @Nonnull
+    @Override
+    public Stream<SourceRoot> getEnabledSourceRoots(Project project, ProjectScope scope, Language language) {
+        MavenProject prj = getMavenProject(nonNull(project, "project"));
+        return prj.getEnabledSourceRoots(scope, language);
+    }
+
     @Override
     public void addSourceRoot(Project project, SourceRoot source) {
         MavenProject prj = getMavenProject(nonNull(project, "project"));