(maven-doxia-sitetools) branch master updated: `PlexusStringUtils` Refaster recipes

[slachiewicz]

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


The following commit(s) were added to refs/heads/master by this push:
     new b58fd53  `PlexusStringUtils` Refaster recipes
b58fd53 is described below

commit b58fd535109f5578555ea418ba04d6c49f880eb2
Author: Sylwester Lachiewicz <slachiew...@apache.org>
AuthorDate: Sun Nov 2 23:18:57 2025 +0000

    `PlexusStringUtils` Refaster recipes
    
    Co-authored-by: Moderne <t...@moderne.io>
---
 .../org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java | 7 ++++---
 .../apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
 
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
index beae6f1..97c8864 100644
--- 
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
+++ 
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
@@ -28,7 +28,6 @@ import org.apache.maven.doxia.module.xhtml5.Xhtml5Sink;
 import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.doxia.siterenderer.DocumentContent;
 import org.apache.maven.doxia.siterenderer.DocumentRenderingContext;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Sink for site rendering of a document, to allow later merge document's 
output with a template.
@@ -180,9 +179,11 @@ public class SiteRendererSink extends Xhtml5Sink 
implements DocumentContent {
             String relativePathToBasedir = 
docRenderingContext.getRelativePath();
 
             if (relativePathToBasedir == null) {
-                txt = StringUtils.replace(txt, "$relativePath", ".");
+                txt = txt == null || txt.isEmpty() ? txt : 
txt.replace("$relativePath", ".");
             } else {
-                txt = StringUtils.replace(txt, "$relativePath", 
relativePathToBasedir);
+                txt = txt == null || txt.isEmpty() || relativePathToBasedir == 
null
+                        ? txt
+                        : txt.replace("$relativePath", relativePathToBasedir);
             }
         }
 
diff --git 
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
 
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
index a70f4b1..fe9fa24 100644
--- 
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
+++ 
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
@@ -551,7 +551,7 @@ public class DefaultSiteRendererTest {
                     FileUtils.getFileNames(dir, getIncludes()[0], 
FileUtils.getDefaultExcludesAsString(), true);
 
             for (String file : l) {
-                file = StringUtils.replace(file, "\\", "/");
+                file = file == null || file.isEmpty() ? file : 
file.replace("\\", "/");
 
                 Reader reader = ReaderFactory.newXmlReader(new File(file));
                 try {