Skip to content

Prefer JDK replace method over deprecated StringUtils method #1230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elharo merged 2 commits into from
Aug 21, 2025
+14 −14
Merged

Prefer JDK replace method over deprecated StringUtils method #1230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c18e89
Prefer JDK replace method over deprecated StringUtils method
elharo Aug 13, 2025
43f607c
check for null
elharo Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2663,12 +2663,15 @@ private void populateCompileArtifactMap(Map<String, Artifact> compileArtifactMap
}

/**
* 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.
Expand All @@ -2678,32 +2681,29 @@ private String getBottomText() {

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}&#x2013;", "");
theBottom = theBottom.replace("{inceptionYear}&#x2013;", "");
} 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}", "");
}
}

Expand Down Expand Up @@ -4813,7 +4813,7 @@ private void addGroups(List<String> arguments) throws MavenReportException {
getLog().warn("A group option is empty. Ignore this option.");
}
} else {
String groupTitle = StringUtils.replace(group.getTitle(), ",", "&#44;");
String groupTitle = group.getTitle().replace(",", "&#44;");
addArgIfNotEmpty(
arguments,
"-group",
Expand Down
Loading