You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2025/08/21 21:54:10 UTC
(maven-javadoc-plugin) branch master updated: Prefer JDK replace method over deprecated StringUtils method (#1230)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 6f134125 Prefer JDK replace method over deprecated StringUtils method (#1230)
6f134125 is described below
commit 6f1341258c2ee9734e0ff75cd500929a4e1bd141
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Thu Aug 21 21:54:04 2025 +0000
Prefer JDK replace method over deprecated StringUtils method (#1230)
* Prefer JDK replace method over deprecated StringUtils method
* check for null
---
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 1a605db2..fffe6d38 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -2664,12 +2664,15 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
}
/**
- * Method that sets the bottom text that will be displayed on the bottom of the
- * javadocs.
+ * Method that sets the text that will be displayed on the bottom of the javadocs.
*
* @return a String that contains the text that will be displayed at the bottom of the javadoc
*/
private String getBottomText() {
+ if (this.bottom == null) {
+ return null;
+ }
+
final String inceptionYear = project.getInceptionYear();
// get Reproducible Builds outputTimestamp date value or the current local date.
@@ -2679,32 +2682,29 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
final String currentYear = Integer.toString(localDate.getYear());
- String theBottom = StringUtils.replace(this.bottom, "{currentYear}", currentYear);
+ String theBottom = this.bottom.replace("{currentYear}", currentYear);
if ((inceptionYear == null) || inceptionYear.equals(currentYear)) {
- theBottom = StringUtils.replace(theBottom, "{inceptionYear}–", "");
+ theBottom = theBottom.replace("{inceptionYear}–", "");
} else {
- theBottom = StringUtils.replace(theBottom, "{inceptionYear}", inceptionYear);
+ theBottom = theBottom.replace("{inceptionYear}", inceptionYear);
}
if (project.getOrganization() == null) {
- theBottom = StringUtils.replace(theBottom, " {organizationName}", "");
+ theBottom = theBottom.replace(" {organizationName}", "");
} else {
if (StringUtils.isNotEmpty(project.getOrganization().getName())) {
if (StringUtils.isNotEmpty(project.getOrganization().getUrl())) {
- theBottom = StringUtils.replace(
- theBottom,
+ theBottom = theBottom.replace(
"{organizationName}",
"<a href=\"" + project.getOrganization().getUrl() + "\">"
+ project.getOrganization().getName() + "</a>");
} else {
- theBottom = StringUtils.replace(
- theBottom,
- "{organizationName}",
- project.getOrganization().getName());
+ theBottom = theBottom.replace(
+ "{organizationName}", project.getOrganization().getName());
}
} else {
- theBottom = StringUtils.replace(theBottom, " {organizationName}", "");
+ theBottom = theBottom.replace(" {organizationName}", "");
}
}
@@ -4810,7 +4810,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
getLog().warn("A group option is empty. Ignore this option.");
}
} else {
- String groupTitle = StringUtils.replace(group.getTitle(), ",", ",");
+ String groupTitle = group.getTitle().replace(",", ",");
addArgIfNotEmpty(
arguments,
"-group",