[maven] branch maven-3.9.x updated: Using Set<>() for contains()

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-3.9.x by this push:
     new 528cea3ad Using Set<>() for contains()
528cea3ad is described below

commit 528cea3ad95887fd465dad23e496f6e41dbeb7ab
Author: Andrey Bruykhov <andreybr...@gmail.com>
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  | 11 +++--------
 maven-core/src/main/java/org/apache/maven/ReactorReader.java |  6 ++++--
 2 files changed, 7 insertions(+), 10 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 0e019d181..f4e3559b5 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -29,6 +29,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;
@@ -280,7 +281,7 @@ public class DefaultMaven implements Maven {
     private void setupWorkspaceReader(MavenSession session, 
DefaultRepositorySystemSession repoSession)
             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
@@ -289,13 +290,7 @@ public class DefaultMaven implements Maven {
             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 d7be04a99..2a3ac7dfc 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -58,8 +58,10 @@ import static java.util.stream.Collectors.toMap;
 class ReactorReader implements MavenWorkspaceReader {
     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");
+    public static final String PROJECT_LOCAL_REPO = "project-local-repo";
+
+    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 final MavenSession session;
     private final Map<String, MavenProject> projectsByGAV;