This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch open-issues in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 366f8ff7f7e654bac34fa8a04ef9c1e211bafab7 Author: Michael Osipov <[email protected]> AuthorDate: Sat Apr 15 22:05:41 2023 +0200 [MSITE-955] Improve DoxiaFilter document source log message --- .../org/apache/maven/plugins/site/run/DoxiaFilter.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java b/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java index 342118f1..508744b3 100644 --- a/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java +++ b/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java @@ -42,6 +42,7 @@ import org.apache.maven.doxia.siterenderer.SiteRenderer; import org.apache.maven.doxia.siterenderer.SiteRenderingContext; import org.apache.maven.doxia.tools.SiteTool; import org.apache.maven.plugins.site.render.ReportDocumentRenderer; +import org.apache.maven.plugins.site.render.SitePluginReportDocumentRenderer; import org.eclipse.jetty.http.MimeTypes; import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; @@ -191,13 +192,18 @@ public class DoxiaFilter implements Filter { private void logDocumentRenderer(String path, String locale, DocumentRenderer docRenderer) { String source; if (docRenderer instanceof DoxiaDocumentRenderer) { - DoxiaDocumentRenderer doxiaDocumentRenderer = (DoxiaDocumentRenderer) docRenderer; - source = doxiaDocumentRenderer.getRenderingContext().getInputName(); + source = docRenderer.getRenderingContext().getDoxiaSourcePath(); } else if (docRenderer instanceof ReportDocumentRenderer) { - ReportDocumentRenderer reportDocumentRenderer = (ReportDocumentRenderer) docRenderer; - source = reportDocumentRenderer.getReportMojoInfo(); + source = ((ReportDocumentRenderer) docRenderer).getReportMojoInfo(); + if (source == null) { + source = "(unknown)"; + } + } else if (docRenderer instanceof SitePluginReportDocumentRenderer) { + source = ((SitePluginReportDocumentRenderer) docRenderer).getReportMojoInfo(); } else { - source = docRenderer.getClass().getName(); + source = docRenderer.getRenderingContext().getGenerator() != null + ? docRenderer.getRenderingContext().getGenerator() + : docRenderer.getClass().getName(); } String localizedPath = !locale.equals(SiteTool.DEFAULT_LOCALE.toString()) ? locale + "/" + path : path; String localizedSource = source
