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-doap-plugin.git
commit d21df615fc06d7e3c4302ca4f2f0ba3b23c6db13 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 05:53:30 2026 +0000 Simplify redundant code --- .../java/org/apache/maven/plugin/doap/AsfExtWriter.java | 4 ++-- .../org/apache/maven/plugin/doap/ContributorWriter.java | 15 +++++++-------- src/main/java/org/apache/maven/plugin/doap/DoapMojo.java | 2 +- src/main/java/org/apache/maven/plugin/doap/DoapUtil.java | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/apache/maven/plugin/doap/AsfExtWriter.java b/src/main/java/org/apache/maven/plugin/doap/AsfExtWriter.java index ba0a6aa..def1954 100644 --- a/src/main/java/org/apache/maven/plugin/doap/AsfExtWriter.java +++ b/src/main/java/org/apache/maven/plugin/doap/AsfExtWriter.java @@ -115,7 +115,7 @@ class AsfExtWriter { // asfext:chair @SuppressWarnings("unchecked") - List<Developer> developers = new ArrayList<Developer>(project.getDevelopers()); + List<Developer> developers = new ArrayList<>(project.getDevelopers()); ContributorWriter.sortContributors(developers); if (StringUtils.isNotEmpty(asfExtOptions.getChair())) { @@ -137,7 +137,7 @@ class AsfExtWriter { } // asfext:member - if (developers != null && developers.size() > 0) { + if (developers != null && !developers.isEmpty()) { List<Developer> pmcMembers = ASFExtOptionsUtil.findPMCMembers(developers); for (Developer pmcMember : pmcMembers) { contributorWriter.writeContributor(writer, pmcMember, asfExtOptions.getXmlnsPrefix(), "member"); diff --git a/src/main/java/org/apache/maven/plugin/doap/ContributorWriter.java b/src/main/java/org/apache/maven/plugin/doap/ContributorWriter.java index 2c2fee2..c6768e4 100644 --- a/src/main/java/org/apache/maven/plugin/doap/ContributorWriter.java +++ b/src/main/java/org/apache/maven/plugin/doap/ContributorWriter.java @@ -20,7 +20,6 @@ package org.apache.maven.plugin.doap; import java.net.MalformedURLException; import java.net.URL; -import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -79,22 +78,22 @@ class ContributorWriter { } // all alphabetical - if (developers.size() != 0) { + if (!developers.isEmpty()) { writeContributor(writer, developers, "developer"); } - if (documenters.size() != 0) { + if (!documenters.isEmpty()) { writeContributor(writer, documenters, "documenter"); } - if (helpers.size() != 0) { + if (!helpers.isEmpty()) { writeContributor(writer, helpers, "helper"); } - if (maintainers.size() != 0) { + if (!maintainers.isEmpty()) { writeContributor(writer, maintainers, "maintainer"); } - if (testers.size() != 0) { + if (!testers.isEmpty()) { writeContributor(writer, testers, "tester"); } - if (translators.size() != 0) { + if (!translators.isEmpty()) { writeContributor(writer, translators, "translator"); } } @@ -234,7 +233,7 @@ class ContributorWriter { */ @SuppressWarnings({"unchecked", "rawtypes"}) static void sortContributors(List contributors) { - Collections.sort(contributors, new Comparator<Contributor>() { + contributors.sort(new Comparator<Contributor>() { public int compare(Contributor contributor1, Contributor contributor2) { if (contributor1 == contributor2) { return 0; diff --git a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java index a6c0a3d..f33460a 100644 --- a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java +++ b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java @@ -745,7 +745,7 @@ public class DoapMojo extends AbstractMojo { // Developers List<Developer> developers = project.getDevelopers(); - contributorWriter.writeContributors(writer, new ArrayList<Contributor>(developers)); + contributorWriter.writeContributors(writer, new ArrayList<>(developers)); // Contributors List<Contributor> contributors = project.getContributors(); diff --git a/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java b/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java index 6406eac..a2c76b4 100644 --- a/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java +++ b/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java @@ -539,7 +539,7 @@ public class DoapUtil { for (Contributor contributor : developersOrContributors) { List<String> roles = contributor.getRoles(); - if (roles != null && roles.size() != 0) { + if (roles != null && !roles.isEmpty()) { for (String role : roles) { role = role.toLowerCase(Locale.ENGLISH); if (role.contains(getLowerCaseString(i18n, "doap.maintainer"))) { @@ -616,7 +616,7 @@ public class DoapUtil { /** * Fork of {@link org.codehaus.plexus.interpolation.reflection.ReflectionValueExtractor} to care of list or arrays. */ - static class ReflectionValueExtractor { + static final class ReflectionValueExtractor { @SuppressWarnings("rawtypes") private static final Class[] CLASS_ARGS = new Class[0];
