Ensure that EclipseJavaCompiler doesn't pass duplicate source files t…

…o ECJ (#230)
codehaus-plexus · Jul 6, 2022 · e136e4c · e136e4c
1 parent d09514d
commit e136e4c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/...piler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java b/...piler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
@@ -37,7 +37,9 @@
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
@@ -245,7 +247,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
         }
 
         // Collect sources
-        List<String> allSources = new ArrayList<>();
+        Set<String> allSources = new HashSet<>();
         for ( String source : config.getSourceLocations() )
         {
             File srcFile = new File( source );
@@ -502,9 +504,9 @@ static boolean isReplaceProcessorPath( CompilerConfiguration config )
         return false;
     }
 
-    static List<String> resortSourcesToPutModuleInfoFirst( List<String> allSources )
+    static Set<String> resortSourcesToPutModuleInfoFirst( Set<String> allSources )
     {
-        ArrayList<String> resorted = new ArrayList<>();
+        Set<String> resorted = new LinkedHashSet<>( allSources.size() );
 
         for ( String mi : allSources )
         {
@@ -652,7 +654,7 @@ private JavaCompiler getEcj()
         return null;
     }
 
-    private void addExtraSources( File dir, List<String> allSources )
+    private void addExtraSources( File dir, Set<String> allSources )
     {
         DirectoryScanner scanner = new DirectoryScanner();
         scanner.setBasedir( dir.getAbsolutePath() );

diff --git a/...r-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompilerTest.java b/...r-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompilerTest.java
@@ -4,7 +4,8 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.util.List;
+import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
@@ -14,42 +15,42 @@ class EclipseJavaCompilerTest
 {
     @ParameterizedTest
     @MethodSource( "sources" )
-    void testReorderedSources( List<String> expected, List<String> inputSources )
+    void testReorderedSources( Set<String> expected, Set<String> inputSources )
     {
-        List<String> resorted = EclipseJavaCompiler.resortSourcesToPutModuleInfoFirst( inputSources );
+        Set<String> resorted = EclipseJavaCompiler.resortSourcesToPutModuleInfoFirst( inputSources );
 
         assertEquals( expected, resorted );
     }
 
     static Stream<Arguments> sources()
     {
-        List<String> expectedOrder = asList(
+        Set<String> expectedOrder = new LinkedHashSet<>( asList(
                 "module-info.java",
                 "plexus/A.java",
                 "plexus/B.java",
                 "eclipse/A.java"
-        );
+        ) );
 
-        List<String> moduleInfoAlreadyFirst = asList(
+        Set<String> moduleInfoAlreadyFirst = new LinkedHashSet<>( asList(
                 "module-info.java",
                 "plexus/A.java",
                 "plexus/B.java",
                 "eclipse/A.java"
-        );
+        ) );
 
-        List<String> moduleInfoSomewhereInTheMiddle = asList(
+        Set<String> moduleInfoSomewhereInTheMiddle = new LinkedHashSet<>( asList(
                 "plexus/A.java",
                 "module-info.java",
                 "plexus/B.java",
                 "eclipse/A.java"
-        );
+        ) );
 
-        List<String> moduleInfoAsLast = asList(
+        Set<String> moduleInfoAsLast = new LinkedHashSet<>( asList(
                 "plexus/A.java",
                 "plexus/B.java",
                 "eclipse/A.java",
                 "module-info.java"
-        );
+        ) );
 
         return Stream.of(
                 Arguments.arguments( expectedOrder, moduleInfoAlreadyFirst ),