This is an automated email from the ASF dual-hosted git repository.
mthmulders pushed a commit to branch
refactor-projectscollector-collectprojects-return-result
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to
refs/heads/refactor-projectscollector-collectprojects-return-result by this
push:
new ec3924e Rename *Collect to *Select
ec3924e is described below
commit ec3924eba3215ae188a965fb8312ae84190de9cc
Author: Maarten Mulders <[email protected]>
AuthorDate: Thu Oct 29 19:58:38 2020 +0100
Rename *Collect to *Select
---
...aultProjectsCollector.java => DefaultProjectsSelector.java} | 10 +++++-----
.../maven/project/collector/MultiModuleCollectionStrategy.java | 8 ++++----
.../{ProjectsCollector.java => ProjectsSelector.java} | 8 ++++----
.../maven/project/collector/RequestPomCollectionStrategy.java | 8 ++++----
.../java/org/apache/maven/graph/DefaultGraphBuilderTest.java | 10 +++++-----
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsCollector.java
b/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
similarity index 91%
rename from
maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsCollector.java
rename to
maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
index bc55fd6..3776c6f 100644
---
a/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsCollector.java
+++
b/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
@@ -39,23 +39,23 @@ import java.util.ArrayList;
import java.util.List;
/**
- * Utility to collect projects for a given set of pom.xml files.
+ * Utility to select projects for a given set of pom.xml files.
*/
@Named
@Singleton
-public class DefaultProjectsCollector implements ProjectsCollector
+public class DefaultProjectsSelector implements ProjectsSelector
{
- private static final Logger LOGGER = LoggerFactory.getLogger(
DefaultProjectsCollector.class );
+ private static final Logger LOGGER = LoggerFactory.getLogger(
DefaultProjectsSelector.class );
private final ProjectBuilder projectBuilder;
@Inject
- public DefaultProjectsCollector( ProjectBuilder projectBuilder )
+ public DefaultProjectsSelector( ProjectBuilder projectBuilder )
{
this.projectBuilder = projectBuilder;
}
@Override
- public List<MavenProject> collectProjects( List<File> files,
MavenExecutionRequest request )
+ public List<MavenProject> selectProjects( List<File> files,
MavenExecutionRequest request )
throws ProjectBuildingException
{
ProjectBuildingRequest projectBuildingRequest =
request.getProjectBuildingRequest();
diff --git
a/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
b/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
index e0bf22f..1aab11c 100644
---
a/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
+++
b/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
@@ -52,13 +52,13 @@ public class MultiModuleCollectionStrategy implements
ProjectCollectionStrategy
{
private final Logger logger = LoggerFactory.getLogger( getClass() );
private final ModelLocator modelLocator;
- private final ProjectsCollector projectsCollector;
+ private final ProjectsSelector projectsSelector;
@Inject
- public MultiModuleCollectionStrategy( ModelLocator modelLocator,
ProjectsCollector projectsCollector )
+ public MultiModuleCollectionStrategy( ModelLocator modelLocator,
ProjectsSelector projectsSelector )
{
this.modelLocator = modelLocator;
- this.projectsCollector = projectsCollector;
+ this.projectsSelector = projectsSelector;
}
@Override
@@ -68,7 +68,7 @@ public class MultiModuleCollectionStrategy implements
ProjectCollectionStrategy
List<File> files = Collections.singletonList(
moduleProjectPomFile.getAbsoluteFile() );
try
{
- List<MavenProject> projects = projectsCollector.collectProjects(
files, request );
+ List<MavenProject> projects = projectsSelector.selectProjects(
files, request );
boolean isRequestedProjectCollected = isRequestedProjectCollected(
request, projects );
if ( isRequestedProjectCollected )
{
diff --git
a/maven-core/src/main/java/org/apache/maven/project/collector/ProjectsCollector.java
b/maven-core/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java
similarity index 84%
rename from
maven-core/src/main/java/org/apache/maven/project/collector/ProjectsCollector.java
rename to
maven-core/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java
index 63328ce..1731021 100644
---
a/maven-core/src/main/java/org/apache/maven/project/collector/ProjectsCollector.java
+++
b/maven-core/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java
@@ -27,17 +27,17 @@ import java.io.File;
import java.util.List;
/**
- * Facade to collect projects for a given set of pom.xml files.
+ * Facade to select projects for a given set of pom.xml files.
*/
-public interface ProjectsCollector
+public interface ProjectsSelector
{
/**
- * Collect Maven projects from a list of POM files.
+ * Select Maven projects from a list of POM files.
* @param files List of POM files.
* @param request The {@link MavenExecutionRequest}
* @return A list of projects that have been found in the specified POM
files.
* @throws ProjectBuildingException In case the POMs are not used.
*/
- List<MavenProject> collectProjects( List<File> files,
MavenExecutionRequest request )
+ List<MavenProject> selectProjects( List<File> files, MavenExecutionRequest
request )
throws ProjectBuildingException;
}
diff --git
a/maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java
b/maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java
index 592eb79..bf50856 100644
---
a/maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java
+++
b/maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java
@@ -37,18 +37,18 @@ import java.util.List;
@Singleton
public class RequestPomCollectionStrategy implements ProjectCollectionStrategy
{
- private final ProjectsCollector projectsCollector;
+ private final ProjectsSelector projectsSelector;
@Inject
- public RequestPomCollectionStrategy( ProjectsCollector projectsCollector )
+ public RequestPomCollectionStrategy( ProjectsSelector projectsSelector )
{
- this.projectsCollector = projectsCollector;
+ this.projectsSelector = projectsSelector;
}
@Override
public List<MavenProject> collectProjects( MavenExecutionRequest request )
throws ProjectBuildingException
{
List<File> files = Collections.singletonList(
request.getPom().getAbsoluteFile() );
- return projectsCollector.collectProjects( files, request );
+ return projectsSelector.selectProjects( files, request );
}
}
diff --git
a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
index 4036c18..2f32973 100644
---
a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
+++
b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
@@ -32,10 +32,10 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingResult;
-import org.apache.maven.project.collector.DefaultProjectsCollector;
+import org.apache.maven.project.collector.DefaultProjectsSelector;
import org.apache.maven.project.collector.MultiModuleCollectionStrategy;
import org.apache.maven.project.collector.PomlessCollectionStrategy;
-import org.apache.maven.project.collector.ProjectsCollector;
+import org.apache.maven.project.collector.ProjectsSelector;
import org.apache.maven.project.collector.RequestPomCollectionStrategy;
import org.codehaus.plexus.util.StringUtils;
import org.junit.Before;
@@ -92,14 +92,14 @@ public class DefaultGraphBuilderTest
private final MavenSession session = mock( MavenSession.class );
private final MavenExecutionRequest mavenExecutionRequest = mock(
MavenExecutionRequest.class );
- private final ProjectsCollector projectsCollector = new
DefaultProjectsCollector( projectBuilder );
+ private final ProjectsSelector projectsSelector = new
DefaultProjectsSelector( projectBuilder );
// Not using mocks for these strategies - a mock would just copy the
actual implementation.
private final ModelLocator modelLocator = new DefaultModelLocator();
private final PomlessCollectionStrategy pomlessCollectionStrategy = new
PomlessCollectionStrategy( projectBuilder );
- private final MultiModuleCollectionStrategy multiModuleCollectionStrategy
= new MultiModuleCollectionStrategy( modelLocator, projectsCollector );
- private final RequestPomCollectionStrategy requestPomCollectionStrategy =
new RequestPomCollectionStrategy( projectsCollector );
+ private final MultiModuleCollectionStrategy multiModuleCollectionStrategy
= new MultiModuleCollectionStrategy( modelLocator, projectsSelector );
+ private final RequestPomCollectionStrategy requestPomCollectionStrategy =
new RequestPomCollectionStrategy( projectsSelector );
private Map<String, MavenProject> artifactIdProjectMap;
