This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch maven-3.8.x in repository https://gitbox.apache.org/repos/asf/maven.git
commit 69f7e2bf283fe1369511624063aa6b40b6b2abef Author: Andrey Bruykhov <[email protected]> AuthorDate: Mon Feb 13 22:46:54 2023 +0300 Using Set<>() for contains() This closes #998 --- maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 13 +++---------- .../src/main/java/org/apache/maven/ReactorReader.java | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index 68fb64d66..7aac469b4 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -30,6 +30,7 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Set; import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.execution.DefaultMavenExecutionResult; @@ -325,7 +326,7 @@ public class DefaultMaven throws ComponentLookupException { // Desired order of precedence for workspace readers before querying the local artifact repositories - List<WorkspaceReader> workspaceReaders = new ArrayList<WorkspaceReader>(); + Set<WorkspaceReader> workspaceReaders = new LinkedHashSet<>(); // 1) Reactor workspace reader workspaceReaders.add( container.lookup( WorkspaceReader.class, ReactorReader.HINT ) ); // 2) Repository system session-scoped workspace reader @@ -335,15 +336,7 @@ public class DefaultMaven workspaceReaders.add( repoWorkspaceReader ); } // 3) .. n) Project-scoped workspace readers - for ( WorkspaceReader workspaceReader : getProjectScopedExtensionComponents( session.getProjects(), - WorkspaceReader.class ) ) - { - if ( workspaceReaders.contains( workspaceReader ) ) - { - continue; - } - workspaceReaders.add( workspaceReader ); - } + workspaceReaders.addAll( getProjectScopedExtensionComponents( session.getProjects(), WorkspaceReader.class ) ); repoSession.setWorkspaceReader( MavenChainedWorkspaceReader.of( workspaceReaders ) ); } diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java index 84662ff87..303915de3 100644 --- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java +++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java @@ -54,8 +54,8 @@ class ReactorReader { public static final String HINT = "reactor"; - private static final Collection<String> COMPILE_PHASE_TYPES = - Arrays.asList( "jar", "ejb-client", "war", "rar", "ejb3", "par", "sar", "wsr", "har", "app-client" ); + private static final Collection<String> COMPILE_PHASE_TYPES = new HashSet<>( + Arrays.asList( "jar", "ejb-client", "war", "rar", "ejb3", "par", "sar", "wsr", "har", "app-client" ) ); private Map<String, MavenProject> projectsByGAV;
