[MJAVADOC-700] Plugin duplicates classes in Java 8 all-classes lists

Replaced an occurrence of File#separatorChar that causes classes to be listed twice in Java 8 on Windows. This closes #180
apache · Feb 12, 2023 · 4123315 · 4123315
1 parent fabff9c
commit 4123315
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -4550,7 +4550,7 @@ private List<String> getFilesWithUnnamedPackages( Map<Path, Collection<String>>
                     continue;
                 }
 
-                if ( currentFile.indexOf( File.separatorChar ) == -1 )
+                if ( currentFile.indexOf( '/' ) == -1 )
                 {
                     returnList.add( currentSourcePath.resolve( currentFile ).toAbsolutePath().toString() );
                 }

diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -306,8 +306,12 @@ public void testDefaultConfiguration()
         if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "11" ) )
         {
             assertThat( apidocs.resolve( "def/configuration/package-frame.html" )).exists();
-            assertThat( apidocs.resolve( "allclasses-frame.html" )).exists();
-            assertThat( apidocs.resolve( "allclasses-noframe.html" )).exists();
+            assertThat( apidocs.resolve( "allclasses-frame.html" )).exists()
+                                                                   .content().containsOnlyOnce("def/configuration/App.html")
+                                                                             .containsOnlyOnce("def/configuration/AppSample.html");
+            assertThat( apidocs.resolve( "allclasses-noframe.html" )).exists()
+                                                                     .content().containsOnlyOnce("def/configuration/App.html")
+                                                                               .containsOnlyOnce("def/configuration/AppSample.html");
         }
 
         // class level generated javadoc files