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-ear-plugin.git

commit f0cf783196738eb7de94d5546c5ec7c51b46abe3
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 17 03:13:01 2026 +0000

    Simplify redundant code
---
 .../java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java | 3 +--
 src/main/java/org/apache/maven/plugins/ear/JbossAppXmlWriter.java     | 2 +-
 .../java/org/apache/maven/plugins/ear/util/ArtifactRepository.java    | 2 +-
 src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java    | 2 +-
 .../java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java     | 4 ++--
 src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java          | 3 +--
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java 
b/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
index 48a08fe..7e02c97 100644
--- a/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
@@ -25,7 +25,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 
@@ -253,7 +252,7 @@ public class GenerateApplicationXmlMojo extends 
AbstractEarMojo {
                     lines.add(line);
                 }
             }
-            Collections.sort(lines);
+            lines.sort(null);
             File parent = moduleMapFile.getAbsoluteFile().getParentFile();
             if (parent != null) {
                 Files.createDirectories(parent.toPath());
diff --git a/src/main/java/org/apache/maven/plugins/ear/JbossAppXmlWriter.java 
b/src/main/java/org/apache/maven/plugins/ear/JbossAppXmlWriter.java
index f75a2cd..9997284 100644
--- a/src/main/java/org/apache/maven/plugins/ear/JbossAppXmlWriter.java
+++ b/src/main/java/org/apache/maven/plugins/ear/JbossAppXmlWriter.java
@@ -156,7 +156,7 @@ final class JbossAppXmlWriter extends AbstractXmlWriter {
 
             // Write the JBoss specific modules
             for (EarModule earModule : earModules) {
-                if (JbossEarModule.class.isInstance(earModule)) {
+                if (earModule instanceof JbossEarModule) {
                     JbossEarModule jbossEarModule = (JbossEarModule) earModule;
                     jbossEarModule.appendJbossModule(writer, 
jbossConfiguration.getVersion());
                 }
diff --git 
a/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java 
b/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java
index 081b987..89f5695 100644
--- a/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java
+++ b/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java
@@ -68,7 +68,7 @@ public class ArtifactRepository {
      */
     public Artifact getUniqueArtifact(String groupId, String artifactId, 
String type, String classifier) {
         final Set<Artifact> candidates = getArtifacts(groupId, artifactId, 
type);
-        if (candidates.size() == 0) {
+        if (candidates.isEmpty()) {
             return null;
         } else if (candidates.size() == 1 && classifier == null) {
             return candidates.iterator().next();
diff --git a/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java 
b/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java
index 04ad16b..a46dd93 100644
--- a/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java
+++ b/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java
@@ -26,7 +26,7 @@ import java.util.Map;
  *
  * @author Stephane Nicoll
  */
-public class JavaEEVersion implements Comparable<JavaEEVersion> {
+public final class JavaEEVersion implements Comparable<JavaEEVersion> {
 
     private static final String VERSION_1_3 = "1.3";
 
diff --git 
a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java 
b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
index ecfd080..5db0172 100644
--- a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
+++ b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
@@ -371,7 +371,7 @@ public abstract class AbstractEarPluginIT {
         }
 
         final File earDirectory = 
getEarDirectory(getEarModuleDirectory(baseDir, earModuleName), projectName);
-        for (int i = 0; i != artifacts.length; ++i) {
+        for (int i = 0; i < artifacts.length; ++i) {
             final String artifactName = artifacts[i];
             final File module = new File(earDirectory, artifactName);
             assertTrue(module.exists(), "Artifact [" + artifactName + "] 
should exist in EAR");
@@ -630,7 +630,7 @@ public abstract class AbstractEarPluginIT {
                 "Rows of expectedClassPathElements parameter should match 
items of artifacts parameter");
 
         final File earFile = getEarArchive(baseDir, projectName);
-        for (int i = 0; i != artifacts.length; ++i) {
+        for (int i = 0; i < artifacts.length; ++i) {
             final String moduleArtifact = artifacts[i];
             final String[] classPathElements = getClassPathElements(earFile, 
moduleArtifact, artifactsDirectory[i]);
             if (expectedClassPathElements[i] == null) {
diff --git a/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java 
b/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java
index 51368f2..d4a1246 100644
--- a/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java
+++ b/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java
@@ -25,7 +25,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -1476,7 +1475,7 @@ class EarMojoIT extends AbstractEarPluginIT {
         final Path moduleMap = 
baseDir.toPath().resolve("target/ear-modules.properties");
         final List<String> lines = Files.readAllLines(moduleMap, 
StandardCharsets.ISO_8859_1);
         final List<String> sorted = new ArrayList<>(lines);
-        Collections.sort(sorted);
+        sorted.sort(null);
         assertEquals(sorted, lines, "module map lines are sorted");
         assertTrue(lines.stream().noneMatch(line -> line.startsWith("#")), 
"module map has no comment lines");
 

Reply via email to