This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 42a4412df67d00c658e13f6a36503549f65fd0f5 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 02:15:56 2026 +0000 Simplify redundant code --- .../apache/maven/plugins/site/deploy/AbstractDeployMojo.java | 6 +++--- .../plugins/site/descriptor/AbstractSiteDescriptorMojo.java | 2 +- .../maven/plugins/site/render/AbstractSiteRenderingMojo.java | 2 +- .../apache/maven/plugins/site/render/AutoRefreshMojo.java | 2 +- .../plugins/site/render/CategorySummaryDocumentRenderer.java | 2 +- .../maven/plugins/site/render/ReportDocumentRenderer.java | 6 +++--- .../java/org/apache/maven/plugins/site/render/SiteMojo.java | 12 ++++++------ .../maven/plugins/site/render/SitemapDocumentRenderer.java | 2 +- .../java/org/apache/maven/plugins/site/run/DoxiaHandler.java | 11 ++++++----- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java index a97cde9d..0ffc5917 100644 --- a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java @@ -234,7 +234,7 @@ public abstract class AbstractDeployMojo extends AbstractSiteMojo { // so we need to convert '\' to '/' in order for the URL to be valid for Windows users relative = relative.replace('\\', '/'); - return ("".equals(relative)) ? "./" : relative; + return "".equals(relative) ? "./" : relative; } /** @@ -558,9 +558,9 @@ public abstract class AbstractDeployMojo extends AbstractSiteMojo { && atIndex + 1 < providerSpecificPart.length() && providerSpecificPart.charAt(atIndex + 1) == '[') { int closingBracket = providerSpecificPart.indexOf(']', atIndex + 1); - colonIndex = (closingBracket > 0) ? providerSpecificPart.indexOf(':', closingBracket) : -1; + colonIndex = closingBracket > 0 ? providerSpecificPart.indexOf(':', closingBracket) : -1; } else { - colonIndex = (atIndex >= 0) ? providerSpecificPart.indexOf(':', atIndex) : -1; + colonIndex = atIndex >= 0 ? providerSpecificPart.indexOf(':', atIndex) : -1; } // Verify this looks like SCP syntax: user@host:path diff --git a/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java b/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java index 395ccd14..7c07cbeb 100644 --- a/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java @@ -118,7 +118,7 @@ public abstract class AbstractSiteDescriptorMojo extends AbstractSiteMojo { getLog().warn("No project URL defined - site links will not be relativized!"); } else { // MSITE-658 - final String localeUrl = !locale.equals(SiteTool.DEFAULT_LOCALE) ? append(url, locale.toString()) : url; + final String localeUrl = locale.equals(SiteTool.DEFAULT_LOCALE) ? url : append(url, locale.toString()); getLog().info("Relativizing site links with respect to localized project URL: " + localeUrl); assembler.resolvePaths(siteModel, localeUrl); diff --git a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java index 1f08db96..c37cdbf9 100644 --- a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java @@ -192,7 +192,7 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo * @return The input files encoding, never <code>null</code>. */ protected String getInputEncoding() { - return (inputEncoding == null || inputEncoding.isEmpty()) + return inputEncoding == null || inputEncoding.isEmpty() ? Charset.defaultCharset().displayName() : inputEncoding; } diff --git a/src/main/java/org/apache/maven/plugins/site/render/AutoRefreshMojo.java b/src/main/java/org/apache/maven/plugins/site/render/AutoRefreshMojo.java index 2e505dba..eeb458c5 100644 --- a/src/main/java/org/apache/maven/plugins/site/render/AutoRefreshMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/render/AutoRefreshMojo.java @@ -107,7 +107,7 @@ public class AutoRefreshMojo extends AbstractSiteRenderingMojo { // Initial full render for (Locale locale : localesList) { getLog().info("Rendering site for " - + (!locale.equals(SiteTool.DEFAULT_LOCALE) ? "locale '" + locale + "'" : "default locale")); + + (locale.equals(SiteTool.DEFAULT_LOCALE) ? "default locale" : "locale '" + locale + "'")); File localeOutputDirectory = getOutputDirectory(locale); List<MavenReportExecution> reports = generateReports ? getReports(localeOutputDirectory) : Collections.emptyList(); diff --git a/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java b/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java index 678149bc..8dd2a591 100644 --- a/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java +++ b/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java @@ -88,7 +88,7 @@ public class CategorySummaryDocumentRenderer implements SitePluginReportDocument throws RendererException, IOException { String msg = "Generating \"" + buffer().strong(title) + "\" report"; // CHECKSTYLE_OFF: MagicNumber - log.info((StringUtils.rightPad(msg, 40) + buffer().strong(" --- ").mojo(reportMojoInfo))); + log.info(StringUtils.rightPad(msg, 40) + buffer().strong(" --- ").mojo(reportMojoInfo)); // CHECKSTYLE_ON: MagicNumber SiteRendererSink sink = new SiteRendererSink(docRenderingContext); diff --git a/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java b/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java index e7205eee..814f00db 100644 --- a/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java +++ b/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java @@ -190,14 +190,14 @@ public class ReportDocumentRenderer implements DocumentRenderer { // single-page reports implementing only generate(Sink, Locale) are reached through its default report.generate(mainSink, multiPageSinkFactory, locale); } catch (MavenReportException e) { - String report = (reportMojoInfo == null) ? ('"' + localReportName + '"') : reportMojoInfo; + String report = reportMojoInfo == null ? ('"' + localReportName + '"') : reportMojoInfo; throw new RendererException("Error generating " + report + " report", e); } catch (RuntimeException re) { // MSITE-836: if report generation throws a RuntimeException, transform to RendererException - String report = (reportMojoInfo == null) ? ('"' + localReportName + '"') : reportMojoInfo; + String report = reportMojoInfo == null ? ('"' + localReportName + '"') : reportMojoInfo; throw new RendererException("Error generating " + report + " report", re); } catch (LinkageError e) { - String report = (reportMojoInfo == null) ? ('"' + localReportName + '"') : reportMojoInfo; + String report = reportMojoInfo == null ? ('"' + localReportName + '"') : reportMojoInfo; log.warn( "An issue has occurred with " + report + " report, skipping LinkageError " + e.getMessage() + ", please report an issue to Maven dev team.", diff --git a/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java b/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java index 4551f2e5..8ccfe01c 100644 --- a/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java @@ -115,9 +115,9 @@ public class SiteMojo extends AbstractSiteRenderingMojo { for (Locale locale : localesList) { getLog().info("Rendering site for " + buffer().strong( - (!locale.equals(SiteTool.DEFAULT_LOCALE) - ? "locale '" + locale + "'" - : "default locale")) + locale.equals(SiteTool.DEFAULT_LOCALE) + ? "default locale" + : "locale '" + locale + "'") .build()); File outputDirectory = getOutputDirectory(locale); List<MavenReportExecution> reports = @@ -211,7 +211,7 @@ public class SiteMojo extends AbstractSiteRenderingMojo { } } - if (doxiaDocuments.size() > 0) { + if (!doxiaDocuments.isEmpty()) { MessageBuilder mb = buffer(); mb.a("Rendering "); mb.strong(doxiaDocuments.size() + " Doxia document" + (doxiaDocuments.size() > 1 ? "s" : "")); @@ -232,7 +232,7 @@ public class SiteMojo extends AbstractSiteRenderingMojo { siteRenderer.render(doxiaDocuments, context, outputDirectory); } - if (generatedDoxiaDocuments.size() > 0) { + if (!generatedDoxiaDocuments.isEmpty()) { MessageBuilder mb = buffer(); mb.a("Rendering "); mb.strong(generatedDoxiaDocuments.size() + " generated Doxia document" @@ -284,7 +284,7 @@ public class SiteMojo extends AbstractSiteRenderingMojo { counts.put(type, count); } - if (documents.size() > 0) { + if (!documents.isEmpty()) { for (Map.Entry<String, Integer> entry : counts.entrySet()) { String type = entry.getKey(); Integer count = entry.getValue(); diff --git a/src/main/java/org/apache/maven/plugins/site/render/SitemapDocumentRenderer.java b/src/main/java/org/apache/maven/plugins/site/render/SitemapDocumentRenderer.java index d5854857..b547408e 100644 --- a/src/main/java/org/apache/maven/plugins/site/render/SitemapDocumentRenderer.java +++ b/src/main/java/org/apache/maven/plugins/site/render/SitemapDocumentRenderer.java @@ -85,7 +85,7 @@ public class SitemapDocumentRenderer implements SitePluginReportDocumentRenderer String msg = "Generating \"" + buffer().strong(title) + "\" report"; // CHECKSTYLE_OFF: MagicNumber - log.info((StringUtils.rightPad(msg, 40) + buffer().strong(" --- ").mojo(reportMojoInfo))); + log.info(StringUtils.rightPad(msg, 40) + buffer().strong(" --- ").mojo(reportMojoInfo)); // CHECKSTYLE_ON: MagicNumber SiteRendererSink sink = new SiteRendererSink(docRenderingContext); diff --git a/src/main/java/org/apache/maven/plugins/site/run/DoxiaHandler.java b/src/main/java/org/apache/maven/plugins/site/run/DoxiaHandler.java index 9957776a..a8c4a267 100644 --- a/src/main/java/org/apache/maven/plugins/site/run/DoxiaHandler.java +++ b/src/main/java/org/apache/maven/plugins/site/run/DoxiaHandler.java @@ -25,6 +25,7 @@ import java.io.StringWriter; import java.io.Writer; import java.net.URLConnection; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; @@ -222,7 +223,7 @@ public class DoxiaHandler implements HttpHandler { } private void sendError(HttpExchange exchange, int statusCode, String message) throws IOException { - send(exchange, statusCode, "text/plain; charset=utf-8", message.getBytes(Charset.forName("UTF-8"))); + send(exchange, statusCode, "text/plain; charset=utf-8", message.getBytes(StandardCharsets.UTF_8)); } private String getMimeType(String name, String encoding) { @@ -252,11 +253,11 @@ public class DoxiaHandler implements HttpHandler { ? docRenderer.getRenderingContext().getGenerator() : docRenderer.getClass().getName(); } - String localizedPath = !locale.equals(SiteTool.DEFAULT_LOCALE.toString()) ? locale + "/" + path : path; + String localizedPath = locale.equals(SiteTool.DEFAULT_LOCALE.toString()) ? path : locale + "/" + path; String localizedSource = source - + (!locale.equals(SiteTool.DEFAULT_LOCALE.toString()) - ? " (locale '" + locale + "')" - : " (default locale)"); + + (locale.equals(SiteTool.DEFAULT_LOCALE.toString()) + ? " (default locale)" + : " (locale '" + locale + "')"); log.info(localizedPath + " -> " + buffer().strong(localizedSource)); } }
