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-changes-plugin.git
commit 425170b1950007a0047ad3affea5438474c01e81 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 05:37:25 2026 +0000 Simplify redundant code --- .../org/apache/maven/plugins/changes/ChangesReportRenderer.java | 2 +- src/main/java/org/apache/maven/plugins/changes/ProjectUtils.java | 2 +- src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java | 2 +- .../changes/announcement/mailsender/ProjectJavamailMailSender.java | 6 +++--- src/main/java/org/apache/maven/plugins/changes/jira/JiraHelper.java | 2 +- .../java/org/apache/maven/plugins/changes/ChangesCheckMojoTest.java | 3 ++- .../maven/plugins/changes/announcement/AnnouncementMojoTest.java | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesReportRenderer.java b/src/main/java/org/apache/maven/plugins/changes/ChangesReportRenderer.java index 4a13597..ac5511f 100644 --- a/src/main/java/org/apache/maven/plugins/changes/ChangesReportRenderer.java +++ b/src/main/java/org/apache/maven/plugins/changes/ChangesReportRenderer.java @@ -348,7 +348,7 @@ public class ChangesReportRenderer extends AbstractIssuesReportRenderer { */ private void constructRelease(Release release) { - final String date = (release.getDateRelease() == null) ? "" : " \u2013 " + release.getDateRelease(); + final String date = release.getDateRelease() == null ? "" : " \u2013 " + release.getDateRelease(); startSection( bundle.getString("report.changes.label.release") + " " + release.getVersion() + date, diff --git a/src/main/java/org/apache/maven/plugins/changes/ProjectUtils.java b/src/main/java/org/apache/maven/plugins/changes/ProjectUtils.java index d2c8366..69dc9d5 100644 --- a/src/main/java/org/apache/maven/plugins/changes/ProjectUtils.java +++ b/src/main/java/org/apache/maven/plugins/changes/ProjectUtils.java @@ -48,7 +48,7 @@ public final class ProjectUtils { || (project.getIssueManagement().getUrl().trim().isEmpty())) { return "No URL set in Issue Management. No " + mojoResult + " will be generated."; } else if ((project.getIssueManagement().getSystem() != null) - && !(project.getIssueManagement().getSystem().equalsIgnoreCase(issueManagementSystem))) { + && !project.getIssueManagement().getSystem().equalsIgnoreCase(issueManagementSystem)) { return "The " + mojoResult + " only supports " + issueManagementSystem + ". No " + mojoResult + " will be generated."; } diff --git a/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java b/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java index 411badf..0206f03 100644 --- a/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java +++ b/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; * @version $Id$ * @since 2.4 */ -public class ReleaseUtils { +public final class ReleaseUtils { private static final String SNAPSHOT_SUFFIX = "-SNAPSHOT"; private static final Logger LOG = LoggerFactory.getLogger(ReleaseUtils.class); diff --git a/src/main/java/org/apache/maven/plugins/changes/announcement/mailsender/ProjectJavamailMailSender.java b/src/main/java/org/apache/maven/plugins/changes/announcement/mailsender/ProjectJavamailMailSender.java index 730d6c0..77fddde 100644 --- a/src/main/java/org/apache/maven/plugins/changes/announcement/mailsender/ProjectJavamailMailSender.java +++ b/src/main/java/org/apache/maven/plugins/changes/announcement/mailsender/ProjectJavamailMailSender.java @@ -111,7 +111,7 @@ public class ProjectJavamailMailSender extends AbstractMailSender { InternetAddress addressFrom = new InternetAddress(mail.getFrom().getRfc2822Address()); msg.setFrom(addressFrom); - if (mail.getToAddresses().size() > 0) { + if (!mail.getToAddresses().isEmpty()) { InternetAddress[] addressTo = new InternetAddress[mail.getToAddresses().size()]; int count = 0; @@ -122,7 +122,7 @@ public class ProjectJavamailMailSender extends AbstractMailSender { msg.setRecipients(Message.RecipientType.TO, addressTo); } - if (mail.getCcAddresses().size() > 0) { + if (!mail.getCcAddresses().isEmpty()) { InternetAddress[] addressCc = new InternetAddress[mail.getCcAddresses().size()]; int count = 0; @@ -133,7 +133,7 @@ public class ProjectJavamailMailSender extends AbstractMailSender { msg.setRecipients(Message.RecipientType.CC, addressCc); } - if (mail.getBccAddresses().size() > 0) { + if (!mail.getBccAddresses().isEmpty()) { InternetAddress[] addressBcc = new InternetAddress[mail.getBccAddresses().size()]; int count = 0; diff --git a/src/main/java/org/apache/maven/plugins/changes/jira/JiraHelper.java b/src/main/java/org/apache/maven/plugins/changes/jira/JiraHelper.java index 74ec646..bd3936c 100644 --- a/src/main/java/org/apache/maven/plugins/changes/jira/JiraHelper.java +++ b/src/main/java/org/apache/maven/plugins/changes/jira/JiraHelper.java @@ -37,7 +37,7 @@ import org.apache.maven.plugin.logging.Log; * @author Dennis Lundberg * @version $Id$ */ -public class JiraHelper { +public final class JiraHelper { private static final String PID = "?pid="; // MCHANGES-281 addd ? /** diff --git a/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTest.java b/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTest.java index d9e5360..e954b58 100644 --- a/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTest.java @@ -59,7 +59,8 @@ public class ChangesCheckMojoTest { @Test public void testIsValidateWithLocale() { - String pattern, locale = null; + String pattern; + String locale = null; // null locale pattern = "yyyy-MM-dd"; diff --git a/src/test/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojoTest.java b/src/test/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojoTest.java index a90bec2..4aff4a9 100644 --- a/src/test/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojoTest.java @@ -81,6 +81,6 @@ public class AnnouncementMojoTest { } private static void assertContains(String content, String announce) { - assertTrue(announce.indexOf(content) > 0); + assertTrue(announce.indexOf(content) >= 1); } }
