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-doxia-sitetools.git

commit 361add938ad78f96d3a87414f3b30a25509c4f27
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 17 01:46:29 2026 +0000

    Simplify redundant code
---
 .../java/org/apache/maven/doxia/tools/DefaultSiteTool.java   |  8 ++++----
 .../test/java/org/apache/maven/doxia/tools/SiteToolTest.java |  8 ++++----
 .../src/main/java/org/apache/maven/doxia/site/SiteUtils.java |  6 +++---
 .../maven/doxia/site/inheritance/URIPathDescriptor.java      | 10 +++++-----
 .../site/inheritance/SiteModelInheritanceAssemblerTest.java  |  4 ++--
 .../apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | 12 ++++++------
 .../org/apache/maven/doxia/siterenderer/MenuBreadcrumbs.java |  2 +-
 .../maven/doxia/siterenderer/SiteRenderingContext.java       |  4 ++--
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git 
a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
 
b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
index 85b8ea4..220c3cf 100644
--- 
a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+++ 
b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
@@ -248,7 +248,7 @@ public class DefaultSiteTool implements SiteTool {
             relativePath = to;
         }
 
-        if (LOGGER.isDebugEnabled() && !relativePath.toString().equals(to)) {
+        if (LOGGER.isDebugEnabled() && !relativePath.equals(to)) {
             LOGGER.debug("Mapped url: " + to + " to relative path: " + 
relativePath);
         }
 
@@ -299,7 +299,7 @@ public class DefaultSiteTool implements SiteTool {
 
         final String relativePath = buildRelativePath(toPath, fromPath, 
File.separatorChar);
 
-        return relativePath.toString();
+        return relativePath;
     }
 
     /** {@inheritDoc} */
@@ -836,7 +836,7 @@ public class DefaultSiteTool implements SiteTool {
         if (normalized == null) {
             normalized = path;
         }
-        return (normalized == null) ? null : normalized.replace('\\', '/');
+        return normalized == null ? null : normalized.replace('\\', '/');
     }
 
     // ----------------------------------------------------------------------
@@ -971,7 +971,7 @@ public class DefaultSiteTool implements SiteTool {
      * @return whether the resolution failed because the artifact is not in 
any repository
      */
     private static boolean isMissing(ArtifactResolutionException e) {
-        return e.getResult().getExceptions().stream().anyMatch(re -> re 
instanceof ArtifactNotFoundException);
+        return 
e.getResult().getExceptions().stream().anyMatch(ArtifactNotFoundException.class::isInstance);
     }
 
     // TODO Remove this transient method when everyone has migrated to Maven 
Site Plugin 4.0.0+
diff --git 
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
 
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
index f1a5dba..d3badc7 100644
--- 
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
+++ 
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
@@ -508,7 +508,7 @@ class SiteToolTest {
                 "Interpolatesite &quot;quoted&quot; &amp; &apos;quoted&apos; 
&lt;sdf&gt;"));
 
         SiteToolMavenProjectStub project = new 
SiteToolMavenProjectStub("interpolated-site");
-        List<MavenProject> reactorProjects = 
Collections.<MavenProject>singletonList(project);
+        List<MavenProject> reactorProjects = 
Collections.singletonList(project);
 
         siteDescriptorContent =
                 tool.getInterpolatedSiteDescriptorContent(new HashMap<>(), 
project, siteDescriptorContent);
@@ -547,7 +547,7 @@ class SiteToolTest {
         effectiveProperties.putAll(childProject.getProperties());
         childProject.getModel().setProperties(effectiveProperties);
 
-        List<MavenProject> reactorProjects = 
Collections.<MavenProject>singletonList(parentProject);
+        List<MavenProject> reactorProjects = 
Collections.singletonList(parentProject);
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
         Properties userProperties = new Properties();
         userProperties.setProperty("userProp1", "from user properties");
@@ -621,7 +621,7 @@ class SiteToolTest {
         assertNotNull(tool);
 
         SiteToolMavenProjectStub project = new 
SiteToolMavenProjectStub("old-to-new-site-model-conversion-test");
-        List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
+        List<MavenProject> reactorProjects = new ArrayList<>();
 
         // model from current local build
         SiteModel model = tool.getSiteModel(
@@ -653,7 +653,7 @@ class SiteToolTest {
         MavenProject parentProject =
                 new SiteToolMavenProjectStub("org.apache.maven.shared.its", 
"mshared-217-parent", "1.0-SNAPSHOT");
         project.setParent(parentProject);
-        List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
+        List<MavenProject> reactorProjects = new ArrayList<>();
 
         RepositorySystemSession repoSession = newRepoSession();
         // coordinates for site descriptor: 
<groupId>:<artifactId>:xml:site:<version>
diff --git 
a/doxia-site-model/src/main/java/org/apache/maven/doxia/site/SiteUtils.java 
b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/SiteUtils.java
index bf82d9e..0464ab1 100644
--- a/doxia-site-model/src/main/java/org/apache/maven/doxia/site/SiteUtils.java
+++ b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/SiteUtils.java
@@ -35,7 +35,7 @@ public class SiteUtils {
 
     private static boolean startsWithIgnoreCase(String str, String prefix) {
         if (str == null || prefix == null) {
-            return (str == null && prefix == null);
+            return str == null && prefix == null;
         }
         if (prefix.length() > str.length()) {
             return false;
@@ -82,7 +82,7 @@ public class SiteUtils {
      */
     public static String getCustomValue(Xpp3Dom custom, String path) {
         custom = getCustomChild(custom, path);
-        return (custom == null) ? null : custom.getValue();
+        return custom == null ? null : custom.getValue();
     }
 
     /**
@@ -96,6 +96,6 @@ public class SiteUtils {
      */
     public static String getCustomValue(Xpp3Dom custom, String path, String 
defaultValue) {
         custom = getCustomChild(custom, path);
-        return (custom == null) ? defaultValue : custom.getValue();
+        return custom == null ? defaultValue : custom.getValue();
     }
 }
diff --git 
a/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptor.java
 
b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptor.java
index 6d32204..ba99289 100644
--- 
a/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptor.java
+++ 
b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptor.java
@@ -194,13 +194,13 @@ public class URIPathDescriptor {
 
     private static boolean sameSite(final URI baseURI, final URI newBaseURI) {
         final boolean sameScheme =
-                (newBaseURI.getScheme() == null ? false : 
baseURI.getScheme().equalsIgnoreCase(newBaseURI.getScheme()));
-        final boolean sameHost = (baseURI.getHost() == null
+                newBaseURI.getScheme() == null ? false : 
baseURI.getScheme().equalsIgnoreCase(newBaseURI.getScheme());
+        final boolean sameHost = baseURI.getHost() == null
                 ? newBaseURI.getHost() == null
-                : baseURI.getHost().equalsIgnoreCase(newBaseURI.getHost()));
-        final boolean samePort = (baseURI.getPort() == newBaseURI.getPort());
+                : baseURI.getHost().equalsIgnoreCase(newBaseURI.getHost());
+        final boolean samePort = baseURI.getPort() == newBaseURI.getPort();
 
-        return (sameScheme && samePort && sameHost);
+        return sameScheme && samePort && sameHost;
     }
 
     /**
diff --git 
a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
 
b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
index ab7930d..85fe091 100644
--- 
a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
+++ 
b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
@@ -823,7 +823,7 @@ class SiteModelInheritanceAssemblerTest {
 
         // now with file url
         parentHref = "file://parent.com/index.html";
-        (parent.getBody().getBreadcrumbs().get(0)).setHref(parentHref);
+        parent.getBody().getBreadcrumbs().get(0).setHref(parentHref);
         child = new SiteModel();
         assembler.assembleModelInheritance(
                 "childName", child, parent, "file://parent.com/child/", 
"file://parent.com/");
@@ -831,7 +831,7 @@ class SiteModelInheritanceAssemblerTest {
 
         // now with scp url
         parentHref = "scp://parent.com/index.html";
-        (parent.getBody().getBreadcrumbs().get(0)).setHref(parentHref);
+        parent.getBody().getBreadcrumbs().get(0).setHref(parentHref);
         child = new SiteModel();
         assembler.assembleModelInheritance("childName", child, parent, 
"scp://parent.com/child/", "scp://parent.com/");
         assertBreadcrumbsCorrect(child.getBody().getBreadcrumbs(), 
"childName", parentHref);
diff --git 
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
index b893bf7..6bd5155 100644
--- 
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+++ 
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -202,7 +202,7 @@ public class DefaultSiteRenderer implements Renderer {
                 for (ParserModule module : modules) {
                     File moduleBasedir = new File(siteDirectoryPath, 
module.getSourceDirectory());
 
-                    String excludes = (moduleExcludes == null) ? null : 
moduleExcludes.get(module.getParserId());
+                    String excludes = moduleExcludes == null ? null : 
moduleExcludes.get(module.getParserId());
 
                     addModuleFiles(
                             siteRenderingContext.getRootDirectory(),
@@ -327,7 +327,7 @@ public class DefaultSiteRenderer implements Renderer {
             Map<String, DocumentRenderer> existingDocumentRenderers,
             boolean skipDuplicates)
             throws RendererException {
-        DuplicateCallback duplicateCallback = (message) -> {
+        DuplicateCallback duplicateCallback = message -> {
             if (skipDuplicates) {
                 LOGGER.debug(message + " (ignored due to flag 
'skipDuplicates').");
             } else {
@@ -336,7 +336,7 @@ public class DefaultSiteRenderer implements Renderer {
             return true;
         };
 
-        DuplicateCallback caseInsensitiveDuplicateCallback = (message) -> {
+        DuplicateCallback caseInsensitiveDuplicateCallback = message -> {
             if (Os.isFamily(Os.FAMILY_WINDOWS)) {
                 return duplicateCallback.onDuplicate(message);
             } else {
@@ -785,9 +785,9 @@ public class DefaultSiteRenderer implements Renderer {
 
             try {
                 SkinModel skinModel = siteRenderingContext.getSkinModel();
-                String encoding = (skinModel == null) ? null : 
skinModel.getEncoding();
+                String encoding = skinModel == null ? null : 
skinModel.getEncoding();
 
-                template = (encoding == null)
+                template = encoding == null
                         ? velocity.getEngine().getTemplate(templateName)
                         : velocity.getEngine().getTemplate(templateName, 
encoding);
             } catch (ParseErrorException pee) {
@@ -885,7 +885,7 @@ public class DefaultSiteRenderer implements Renderer {
                         : skinModel.getPrerequisites().getDoxiaSitetools();
 
                 Package p = DefaultSiteRenderer.class.getPackage();
-                String current = (p == null) ? null : 
p.getImplementationVersion();
+                String current = p == null ? null : 
p.getImplementationVersion();
 
                 if (StringUtils.isNotBlank(toolsPrerequisite)
                         && (current != null)
diff --git 
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/MenuBreadcrumbs.java
 
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/MenuBreadcrumbs.java
index 77fedbf..5674f9f 100644
--- 
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/MenuBreadcrumbs.java
+++ 
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/MenuBreadcrumbs.java
@@ -39,7 +39,7 @@ import org.apache.maven.doxia.site.SiteUtils;
  *
  * @since 2.1.1
  */
-class MenuBreadcrumbs {
+final class MenuBreadcrumbs {
 
     private MenuBreadcrumbs() {}
 
diff --git 
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
 
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
index 9f349ca..2c881af 100644
--- 
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
+++ 
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
@@ -369,8 +369,8 @@ public class SiteRenderingContext {
     @Deprecated
     public void setSkin(Artifact skin) {
         this.skin = skin;
-        this.skinFile = (skin == null) ? null : skin.getFile();
-        this.skinId = (skin == null) ? null : skin.getId();
+        this.skinFile = skin == null ? null : skin.getFile();
+        this.skinId = skin == null ? null : skin.getId();
     }
 
     /**

Reply via email to