Skip to content

Commit 4123315

Browse files
robtimusmichael-o
authored andcommitted
[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
1 parent fabff9c commit 4123315

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4550,7 +4550,7 @@ private List<String> getFilesWithUnnamedPackages( Map<Path, Collection<String>>
45504550
continue;
45514551
}
45524552

4553-
if ( currentFile.indexOf( File.separatorChar ) == -1 )
4553+
if ( currentFile.indexOf( '/' ) == -1 )
45544554
{
45554555
returnList.add( currentSourcePath.resolve( currentFile ).toAbsolutePath().toString() );
45564556
}

src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,12 @@ public void testDefaultConfiguration()
306306
if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "11" ) )
307307
{
308308
assertThat( apidocs.resolve( "def/configuration/package-frame.html" )).exists();
309-
assertThat( apidocs.resolve( "allclasses-frame.html" )).exists();
310-
assertThat( apidocs.resolve( "allclasses-noframe.html" )).exists();
309+
assertThat( apidocs.resolve( "allclasses-frame.html" )).exists()
310+
.content().containsOnlyOnce("def/configuration/App.html")
311+
.containsOnlyOnce("def/configuration/AppSample.html");
312+
assertThat( apidocs.resolve( "allclasses-noframe.html" )).exists()
313+
.content().containsOnlyOnce("def/configuration/App.html")
314+
.containsOnlyOnce("def/configuration/AppSample.html");
311315
}
312316

313317
// class level generated javadoc files

0 commit comments

Comments
 (0)