Skip to content

Commit 95a8aeb

Browse files
etiennestudererichaagdev
authored andcommitted
Polish a bit
1 parent e79fbbe commit 95a8aeb

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/RootProjectExtractor.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.gradle;
22

3-
import org.apache.maven.execution.ExecutionEvent;
43
import org.apache.maven.execution.MavenExecutionRequest;
54
import org.apache.maven.execution.MavenSession;
65
import org.apache.maven.model.building.ModelProcessor;
@@ -16,6 +15,7 @@
1615
import static java.util.Collections.emptyList;
1716

1817
public class RootProjectExtractor {
18+
1919
private final ProjectBuilder projectBuilder;
2020
private final ModelProcessor modelProcessor;
2121
private final Logger logger;
@@ -27,10 +27,6 @@ public RootProjectExtractor(ProjectBuilder projectBuilder, ModelProcessor modelP
2727
this.logger = logger;
2828
}
2929

30-
public MavenProject extractRootProject(ExecutionEvent event) {
31-
return extractRootProject(event.getSession());
32-
}
33-
3430
public MavenProject extractRootProject(MavenSession session) {
3531
List<MavenProject> allProjects = discoverAllProjects(session.getAllProjects());
3632
File workspaceDirectory = getWorkspaceDirectory(session);
@@ -44,11 +40,11 @@ public MavenProject extractRootProject(MavenSession session) {
4440
try {
4541
return projectBuilder.build(workspaceDirectoryPom, session.getProjectBuildingRequest()).getProject();
4642
} catch (ProjectBuildingException e) {
47-
logger.error("Exception locating the top level project", e);
43+
logger.error("Error locating the top level project", e);
4844
}
4945
}
5046

51-
// We didn't successfully identify the root project, so just return the first project.
47+
// return the first project if the top level project was not identified successfully
5248
return allProjects.get(0);
5349
}
5450

@@ -61,13 +57,10 @@ private File getWorkspaceDirectory(MavenSession session) {
6157
}
6258
}
6359

64-
/**
65-
* Older Maven versions under-reported the list of discovered projects.
66-
* This method discovers all their submodules. For newer Maven versions it is a no-op.
67-
*/
6860
private List<MavenProject> discoverAllProjects(Collection<MavenProject> sessionProjects) {
6961
Set<MavenProject> allProjects = new LinkedHashSet<>(sessionProjects);
7062
sessionProjects.stream().flatMap(p -> Optional.ofNullable(p.getCollectedProjects()).orElse(emptyList()).stream()).forEach(allProjects::add);
7163
return new ArrayList<MavenProject>(allProjects);
7264
}
65+
7366
}

0 commit comments

Comments
 (0)