Using Set<>() for contains()

This closes #998
apache · Mar 8, 2023 · 69f7e2b · 69f7e2b
1 parent 11199cf
commit 69f7e2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -30,6 +30,7 @@
 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 @@ private void setupWorkspaceReader( MavenSession session, DefaultRepositorySystem
         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 @@ private void setupWorkspaceReader( MavenSession session, DefaultRepositorySystem
             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
@@ -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;