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

commit 8bba8cbbd9f725250ecd445b37faa68c4c8a29a2
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 17 02:57:49 2026 +0000

    Simplify redundant code
---
 src/main/java/org/apache/maven/plugins/war/Overlay.java              | 4 ++--
 .../java/org/apache/maven/plugins/war/overlay/OverlayManager.java    | 4 ++--
 .../apache/maven/plugins/war/packaging/WarProjectPackagingTask.java  | 2 +-
 src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java  | 2 +-
 src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java      | 5 ++---
 .../java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/war/Overlay.java 
b/src/main/java/org/apache/maven/plugins/war/Overlay.java
index dabec5d..bc6cef1 100644
--- a/src/main/java/org/apache/maven/plugins/war/Overlay.java
+++ b/src/main/java/org/apache/maven/plugins/war/Overlay.java
@@ -95,7 +95,7 @@ public class Overlay {
      * @return true if the overlay represents the current project, false 
otherwise
      */
     public boolean isCurrentProject() {
-        return (groupId == null && artifactId == null);
+        return groupId == null && artifactId == null;
     }
 
     /**
@@ -317,7 +317,7 @@ public class Overlay {
     @Override
     public int hashCode() {
         int result;
-        result = (getId() != null ? getId().hashCode() : 0);
+        result = getId() != null ? getId().hashCode() : 0;
         result = 31 * result + (includes != null ? Arrays.hashCode(includes) : 
0);
         result = 31 * result + (excludes != null ? Arrays.hashCode(excludes) : 
0);
         return result;
diff --git 
a/src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java 
b/src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java
index bf4193b..e8ee742 100644
--- a/src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java
+++ b/src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java
@@ -198,12 +198,12 @@ public class OverlayManager {
      * @return boolean true if equals
      */
     private boolean compareOverlayWithArtifact(Overlay overlay, Artifact 
artifact) {
-        return (Objects.equals(overlay.getGroupId(), artifact.getGroupId())
+        return Objects.equals(overlay.getGroupId(), artifact.getGroupId())
                 && Objects.equals(overlay.getArtifactId(), 
artifact.getArtifactId())
                 && Objects.equals(overlay.getType(), artifact.getType())
                 // MWAR-241 Make sure to treat null and "" as equal when 
comparing the classifier
                 && Objects.equals(
-                        Objects.toString(overlay.getClassifier()), 
Objects.toString(artifact.getClassifier())));
+                        Objects.toString(overlay.getClassifier()), 
Objects.toString(artifact.getClassifier()));
     }
 
     /**
diff --git 
a/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
 
b/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
index 7f8a579..2f87663 100644
--- 
a/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
+++ 
b/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
@@ -120,7 +120,7 @@ public class WarProjectPackagingTask extends 
AbstractWarPackagingTask {
                 throw new MojoExecutionException("The <directory> tag is 
missing from the <resource> tag.");
             }
 
-            if (!(new File(resource.getDirectory())).isAbsolute()) {
+            if (!new File(resource.getDirectory()).isAbsolute()) {
                 resource.setDirectory(context.getProject().getBasedir() + 
File.separator + resource.getDirectory());
             }
 
diff --git 
a/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java 
b/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java
index 78906eb..3507254 100644
--- a/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java
+++ b/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java
@@ -86,7 +86,7 @@ public class DependencyInfo {
     @Override
     public int hashCode() {
         int result;
-        result = (dependency != null ? dependency.hashCode() : 0);
+        result = dependency != null ? dependency.hashCode() : 0;
         result = 31 * result + (targetFileName != null ? 
targetFileName.hashCode() : 0);
         return result;
     }
diff --git a/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java 
b/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
index e33090e..faa93c3 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
@@ -23,7 +23,6 @@ import java.io.FileFilter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -663,8 +662,8 @@ public class WarOverlaysTest {
         }
 
         // Now we have the files, sort them.
-        Collections.sort(expectedFiles);
-        Collections.sort(webAppContent);
+        expectedFiles.sort(null);
+        webAppContent.sort(null);
         assertEquals(
                 expectedFiles,
                 webAppContent,
diff --git 
a/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java 
b/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java
index 933c1ea..fb5d457 100644
--- a/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java
@@ -67,7 +67,7 @@ public abstract class AbstractArtifactStub extends 
ArtifactStub {
         if (a.getGroupId() != null) {
             result = getGroupId().compareTo(a.getGroupId());
         } else {
-            result = (getGroupId() == null ? 0 : -1);
+            result = getGroupId() == null ? 0 : -1;
         }
         /* -- */
 

Reply via email to