[MJAVADOC-783] Invalid path when using TagletArtifact and TagletPath

kriegaex · michael-o · commit be2fa208674c · 2024-07-14T17:46:23.000+02:00
Co-authored-by: Rob Gordon <rob@rgordon.co.uk> Co-authored-by: Michael Osipov <michaelo@apache.org> This closes #300
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -2968,14 +2968,11 @@ private String getTagletPath() throws MavenReportException {
             }
         }
 
-        StringBuilder path = new StringBuilder();
-        path.append(StringUtils.join(pathParts.iterator(), File.pathSeparator));
-
-        if (tagletpath != null && !tagletpath.isEmpty()) {
-            path.append(JavadocUtil.unifyPathSeparator(tagletpath));
+        if (StringUtils.isNotEmpty(tagletpath)) {
+            pathParts.addAll(Arrays.asList(JavadocUtil.splitPath(tagletpath)));
         }
 
-        return path.toString();
+        return StringUtils.join(pathParts, File.pathSeparator);
     }
 
     private Set<String> collectLinks() throws MavenReportException {

Original file line number	Diff line number	Diff line change
`@@ -2968,14 +2968,11 @@ private String getTagletPath() throws MavenReportException {`
`2968`	`2968`	`}`
`2969`	`2969`	`}`
`2970`	`2970`
`2971`		`- StringBuilder path = new StringBuilder();`
`2972`		`- path.append(StringUtils.join(pathParts.iterator(), File.pathSeparator));`
`2973`		`-`
`2974`		`- if (tagletpath != null && !tagletpath.isEmpty()) {`
`2975`		`- path.append(JavadocUtil.unifyPathSeparator(tagletpath));`
	`2971`	`+ if (StringUtils.isNotEmpty(tagletpath)) {`
	`2972`	`+ pathParts.addAll(Arrays.asList(JavadocUtil.splitPath(tagletpath)));`
`2976`	`2973`	`}`
`2977`	`2974`
`2978`		`- return path.toString();`
	`2975`	`+ return StringUtils.join(pathParts, File.pathSeparator);`
`2979`	`2976`	`}`
`2980`	`2977`
`2981`	`2978`	`private Set<String> collectLinks() throws MavenReportException {`