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-remote-resources-plugin.git

commit 6e0347dc8be29c1bb1a4ac27c91610aa8255f4ae
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 17 07:36:32 2026 +0000

    Simplify redundant code
---
 .../remote/AbstractProcessRemoteResourcesMojo.java     |  6 +++---
 .../resources/remote/BundleRemoteResourcesMojo.java    |  2 +-
 .../resources/remote/ModelInheritanceAssembler.java    |  8 ++++----
 .../resources/remote/RemoteResourcesMojoTest.java      |  2 +-
 .../resources/remote/stub/MavenProjectBasicStub.java   | 18 ++++++++----------
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java
 
b/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java
index 82a4deb..dd7b903 100644
--- 
a/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java
+++ 
b/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java
@@ -447,7 +447,7 @@ public abstract class AbstractProcessRemoteResourcesMojo 
extends AbstractMojo {
 
         if (resolveScopes == null) {
             resolveScopes = new String[] {
-                (this.includeScope == null || this.includeScope.isEmpty()) ? 
JavaScopes.TEST : this.includeScope
+                this.includeScope == null || this.includeScope.isEmpty() ? 
JavaScopes.TEST : this.includeScope
             };
         }
 
@@ -1089,8 +1089,8 @@ public abstract class AbstractProcessRemoteResourcesMojo 
extends AbstractMojo {
             throw new MojoExecutionException("Error parsing remote resource 
bundle descriptor.", xppe);
         }
 
-        getLog().info("Copying " + resourceCount + " resource" + 
((resourceCount > 1) ? "s" : "") + " from "
-                + bundleCount + " bundle" + ((bundleCount > 1) ? "s" : "") + 
".");
+        getLog().info("Copying " + resourceCount + " resource" + 
(resourceCount > 1 ? "s" : "") + " from " + bundleCount
+                + " bundle" + (bundleCount > 1 ? "s" : "") + ".");
 
         String velocityResource = null;
         try {
diff --git 
a/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
 
b/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
index 13f9e59..187196f 100644
--- 
a/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
+++ 
b/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
@@ -138,7 +138,7 @@ public class BundleRemoteResourcesMojo extends AbstractMojo 
{
         }
 
         int n = remoteResourcesBundle.getRemoteResources().size();
-        getLog().info("Writing " + RESOURCES_MANIFEST + " descriptor with " + 
n + " entr" + ((n > 1) ? "ies" : "y"));
+        getLog().info("Writing " + RESOURCES_MANIFEST + " descriptor with " + 
n + " entr" + (n > 1 ? "ies" : "y"));
 
         RemoteResourcesBundleXpp3Writer w = new 
RemoteResourcesBundleXpp3Writer();
 
diff --git 
a/src/main/java/org/apache/maven/plugin/resources/remote/ModelInheritanceAssembler.java
 
b/src/main/java/org/apache/maven/plugin/resources/remote/ModelInheritanceAssembler.java
index e0ebd29..557b51c 100644
--- 
a/src/main/java/org/apache/maven/plugin/resources/remote/ModelInheritanceAssembler.java
+++ 
b/src/main/java/org/apache/maven/plugin/resources/remote/ModelInheritanceAssembler.java
@@ -215,22 +215,22 @@ public class ModelInheritanceAssembler {
         }
 
         // developers
-        if (child.getDevelopers().size() == 0) {
+        if (child.getDevelopers().isEmpty()) {
             child.setDevelopers(parent.getDevelopers());
         }
 
         // licenses
-        if (child.getLicenses().size() == 0) {
+        if (child.getLicenses().isEmpty()) {
             child.setLicenses(parent.getLicenses());
         }
 
         // developers
-        if (child.getContributors().size() == 0) {
+        if (child.getContributors().isEmpty()) {
             child.setContributors(parent.getContributors());
         }
 
         // mailingLists
-        if (child.getMailingLists().size() == 0) {
+        if (child.getMailingLists().isEmpty()) {
             child.setMailingLists(parent.getMailingLists());
         }
 
diff --git 
a/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
 
b/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
index 2e80cc1..1213523 100644
--- 
a/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
+++ 
b/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
@@ -845,7 +845,7 @@ class RemoteResourcesMojoTest {
         String data = FileUtils.fileRead(xmlFile);
 
         List<String> expectedOrder = new 
ArrayList<>(Arrays.asList(resourceNames));
-        Collections.sort(expectedOrder);
+        expectedOrder.sort(null);
         assertContainsInOrder(data, expectedOrder);
 
         if (null != jarName) {
diff --git 
a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java
 
b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java
index 19b4f0a..4dcf2ee 100644
--- 
a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java
+++ 
b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java
@@ -25,8 +25,6 @@ import java.util.Properties;
 
 import org.apache.maven.api.plugin.testing.MojoExtension;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Profile;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.FileUtils;
 
@@ -135,14 +133,14 @@ public class MavenProjectBasicStub extends MavenProject {
     private void initializeParentFields() {
         // the pom should be located in the isolated dummy root
         super.setFile(new File(getBasedir(), "pom.xml"));
-        super.setDependencyArtifacts(new HashSet<Artifact>());
-        super.setArtifacts(new HashSet<Artifact>());
-        super.setReportArtifacts(new HashSet<Artifact>());
-        super.setExtensionArtifacts(new HashSet<Artifact>());
-        super.setRemoteArtifactRepositories(new 
LinkedList<ArtifactRepository>());
-        super.setPluginArtifactRepositories(new 
LinkedList<ArtifactRepository>());
-        super.setCollectedProjects(new LinkedList<MavenProject>());
-        super.setActiveProfiles(new LinkedList<Profile>());
+        super.setDependencyArtifacts(new HashSet<>());
+        super.setArtifacts(new HashSet<>());
+        super.setReportArtifacts(new HashSet<>());
+        super.setExtensionArtifacts(new HashSet<>());
+        super.setRemoteArtifactRepositories(new LinkedList<>());
+        super.setPluginArtifactRepositories(new LinkedList<>());
+        super.setCollectedProjects(new LinkedList<>());
+        super.setActiveProfiles(new LinkedList<>());
         super.setOriginalModel(null);
         super.setExecutionProject(this);
         super.setArtifact(artifact);

Reply via email to