This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 0fd9867 Simplify code (#589)
0fd9867 is described below
commit 0fd98675a1f77c096b5d5fb91caff35c78bc6281
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Mon Nov 24 13:21:55 2025 -0600
Simplify code (#589)
* Simplify code
* isEmpty
* Update src/main/java/org/apache/maven/plugins/war/Overlay.java
Co-authored-by: Copilot <[email protected]>
---------
Co-authored-by: Copilot <[email protected]>
---
src/main/java/org/apache/maven/plugins/war/Overlay.java | 6 ++----
.../maven/plugins/war/packaging/AbstractWarPackagingTask.java | 2 +-
.../apache/maven/plugins/war/packaging/WarProjectPackagingTask.java | 4 ++--
.../org/apache/maven/plugins/war/overlay/OverlayManagerTest.java | 6 +++---
.../java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java | 5 -----
5 files changed, 8 insertions(+), 15 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 3f9d182..dabec5d 100644
--- a/src/main/java/org/apache/maven/plugins/war/Overlay.java
+++ b/src/main/java/org/apache/maven/plugins/war/Overlay.java
@@ -325,14 +325,12 @@ public class Overlay {
private String[] parse(String s) {
final List<String> result = new ArrayList<>();
- if (s == null) {
- return result.toArray(new String[result.size()]);
- } else {
+ if (s != null) {
String[] tokens = s.split(",");
for (String token : tokens) {
result.add(token.trim());
}
- return result.toArray(new String[result.size()]);
}
+ return result.toArray(new String[0]);
}
}
diff --git
a/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
b/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
index 141f6a9..ee0fa8d 100644
---
a/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
+++
b/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
@@ -433,7 +433,7 @@ public abstract class AbstractWarPackagingTask implements
WarPackagingTask {
}
String classifier = artifact.getClassifier();
- if ((classifier != null) && !("".equals(classifier.trim()))) {
+ if (classifier != null && !(classifier.trim().isEmpty())) {
return
MappingUtils.evaluateFileNameMapping(MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER,
artifact);
} else {
return
MappingUtils.evaluateFileNameMapping(MappingUtils.DEFAULT_FILE_NAME_MAPPING,
artifact);
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 48dbbcc..b00ddbc 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
@@ -205,7 +205,7 @@ public class WarProjectPackagingTask extends
AbstractWarPackagingTask {
throws MojoFailureException, MojoExecutionException {
try {
if (webXml != null && StringUtils.isNotEmpty(webXml.getName())) {
- if (!webXml.exists() && (failOnMissingWebXml == null ||
Boolean.TRUE.equals(failOnMissingWebXml))) {
+ if (!webXml.exists() && (failOnMissingWebXml == null ||
failOnMissingWebXml)) {
throw new MojoFailureException("The specified web.xml file
'" + webXml + "' does not exist");
}
@@ -262,7 +262,7 @@ public class WarProjectPackagingTask extends
AbstractWarPackagingTask {
}
}
} catch (IOException e) {
- if (failOnMissingWebXml == null ||
Boolean.TRUE.equals(failOnMissingWebXml)) {
+ if (failOnMissingWebXml == null || failOnMissingWebXml) {
throw new MojoExecutionException("Failed to copy deployment
descriptor", e);
}
} catch (MavenFilteringException e) {
diff --git
a/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
b/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
index d8a9b9e..68ba8b2 100644
--- a/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
@@ -59,11 +59,11 @@ class OverlayManagerTest {
final List<Overlay> overlays = new ArrayList<>();
- final Overlay overlay = currentProjectOverlay;
- OverlayManager manager = new OverlayManager(overlays, project,
DEFAULT_INCLUDES, DEFAULT_EXCLUDES, overlay);
+ OverlayManager manager =
+ new OverlayManager(overlays, project, DEFAULT_INCLUDES,
DEFAULT_EXCLUDES, currentProjectOverlay);
assertNotNull(manager.getOverlays());
assertEquals(2, manager.getOverlays().size());
- assertEquals(overlay, manager.getOverlays().get(0));
+ assertEquals(currentProjectOverlay, manager.getOverlays().get(0));
assertEquals(new DefaultOverlay(first), manager.getOverlays().get(1));
}
diff --git
a/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
index 77c07d6..40faa2e 100644
--- a/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
@@ -20,7 +20,6 @@ package org.apache.maven.plugins.war.stub;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.artifact.versioning.VersionRange;
/**
* stub for copy constructor
@@ -31,10 +30,6 @@ public class WarArtifact4CCStub extends WarArtifactStub {
super(basedir);
}
- public VersionRange getVersionRange() {
- return VersionRange.createFromVersion(getVersion());
- }
-
public String getGroupId() {
return "org.maven.plugin.test";
}
