Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify code (#1156)

This commit is contained in:
Guillaume Nodet 2023-06-13 22:45:33 +02:00 committed by GitHub
parent 973b1b9684
commit 898e4e4b3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -327,7 +327,7 @@ private MavenExecutionResult doExecute(
}
} finally {
try {
afterSessionEnd(session.getProjects(), session);
afterSessionEnd(session);
} catch (MavenExecutionException e) {
return addExceptionToResult(result, e);
}
@ -354,44 +354,29 @@ private void setupWorkspaceReader(MavenSession session, DefaultRepositorySystemS
}
private void afterSessionStart(MavenSession session) throws MavenExecutionException {
// CHECKSTYLE_OFF: LineLength
for (AbstractMavenLifecycleParticipant listener :
getExtensionComponents(Collections.emptyList(), AbstractMavenLifecycleParticipant.class))
// CHECKSTYLE_ON: LineLength
{
listener.afterSessionStart(session);
}
callListeners(session, AbstractMavenLifecycleParticipant::afterSessionStart);
}
private void afterProjectsRead(MavenSession session) throws MavenExecutionException {
callListeners(session, AbstractMavenLifecycleParticipant::afterProjectsRead);
}
private void afterSessionEnd(MavenSession session) throws MavenExecutionException {
callListeners(session, AbstractMavenLifecycleParticipant::afterSessionEnd);
}
@FunctionalInterface
interface ListenerMethod {
void run(AbstractMavenLifecycleParticipant listener, MavenSession session) throws MavenExecutionException;
}
private void callListeners(MavenSession session, ListenerMethod method) throws MavenExecutionException {
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
try {
// CHECKSTYLE_OFF: LineLength
for (AbstractMavenLifecycleParticipant listener :
getExtensionComponents(session.getProjects(), AbstractMavenLifecycleParticipant.class))
// CHECKSTYLE_ON: LineLength
{
getExtensionComponents(session.getProjects(), AbstractMavenLifecycleParticipant.class)) {
Thread.currentThread().setContextClassLoader(listener.getClass().getClassLoader());
listener.afterProjectsRead(session);
}
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
}
}
private void afterSessionEnd(Collection<MavenProject> projects, MavenSession session)
throws MavenExecutionException {
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
try {
// CHECKSTYLE_OFF: LineLength
for (AbstractMavenLifecycleParticipant listener :
getExtensionComponents(projects, AbstractMavenLifecycleParticipant.class))
// CHECKSTYLE_ON: LineLength
{
Thread.currentThread().setContextClassLoader(listener.getClass().getClassLoader());
listener.afterSessionEnd(session);
method.run(listener, session);
}
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
@ -451,6 +436,9 @@ private <T> Collection<T> getExtensionComponents(Collection<MavenProject> projec
}
protected <T> Collection<T> getProjectScopedExtensionComponents(Collection<MavenProject> projects, Class<T> role) {
if (projects == null) {
return Collections.emptyList();
}
Collection<T> foundComponents = new LinkedHashSet<>();
Collection<ClassLoader> scannedRealms = new HashSet<>();