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-dependency-plugin.git
commit 31caa2a43e1f9f6b3881e315e5934cb9687fb75e Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 04:12:44 2026 +0000 Simplify redundant code --- .../org/apache/maven/plugins/dependency/AbstractDependencyMojo.java | 4 ++-- .../org/apache/maven/plugins/dependency/RemoveDependencyMojo.java | 6 +++--- .../org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java | 2 +- .../org/apache/maven/plugins/dependency/exclusion/Coordinates.java | 2 +- .../maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java | 3 +-- .../maven/plugins/dependency/tree/VerboseJavaScopeSelector.java | 3 +-- .../maven/plugins/dependency/utils/filters/ResolveFileFilter.java | 2 +- .../dependency/fromConfiguration/DependencyVersionResolverTest.java | 2 +- .../maven/plugins/dependency/fromConfiguration/TestCopyMojo.java | 2 +- .../org/apache/maven/plugins/dependency/tree/TreeTokensTest.java | 4 ++-- .../dependency/utils/markers/TestUnpackMarkerFileHandler.java | 6 +++--- 11 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java index 9eebfcc1..d3fff714 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java @@ -173,9 +173,9 @@ public abstract class AbstractDependencyMojo extends AbstractMojo { if (deps == null) { return false; } - String searchType = (coords.getType() != null && !coords.getType().isEmpty()) ? coords.getType() : "jar"; + String searchType = coords.getType() != null && !coords.getType().isEmpty() ? coords.getType() : "jar"; String searchClassifier = - (coords.getClassifier() != null && !coords.getClassifier().isEmpty()) ? coords.getClassifier() : ""; + coords.getClassifier() != null && !coords.getClassifier().isEmpty() ? coords.getClassifier() : ""; for (Dependency dep : deps) { if (coords.getGroupId().equals(dep.getGroupId()) && coords.getArtifactId().equals(dep.getArtifactId())) { diff --git a/src/main/java/org/apache/maven/plugins/dependency/RemoveDependencyMojo.java b/src/main/java/org/apache/maven/plugins/dependency/RemoveDependencyMojo.java index d525b8bc..edf208e3 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/RemoveDependencyMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/RemoveDependencyMojo.java @@ -163,9 +163,9 @@ public class RemoveDependencyMojo extends AbstractDependencyMojo { Model model = targetProject.getModel(); if (model != null) { String removeType = - (coords.getType() != null && !coords.getType().isEmpty()) ? coords.getType() : "jar"; - String removeClassifier = (coords.getClassifier() != null - && !coords.getClassifier().isEmpty()) + coords.getType() != null && !coords.getType().isEmpty() ? coords.getType() : "jar"; + String removeClassifier = coords.getClassifier() != null + && !coords.getClassifier().isEmpty() ? coords.getClassifier() : ""; if (targetManaged) { diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java index 0f4540bf..def988d8 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java +++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java @@ -284,7 +284,7 @@ public class AnalyzeDepMgt extends AbstractMojo { */ public String getArtifactManagementKey(Artifact artifact) { return artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getType() - + ((artifact.getClassifier() != null) ? ":" + artifact.getClassifier() : ""); + + (artifact.getClassifier() != null ? ":" + artifact.getClassifier() : ""); } /** diff --git a/src/main/java/org/apache/maven/plugins/dependency/exclusion/Coordinates.java b/src/main/java/org/apache/maven/plugins/dependency/exclusion/Coordinates.java index d81f7b37..927ab568 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/exclusion/Coordinates.java +++ b/src/main/java/org/apache/maven/plugins/dependency/exclusion/Coordinates.java @@ -35,7 +35,7 @@ import org.apache.maven.model.InputLocation; * When dealing with exclusions the version is not important. Only groupId and artifactId is used. * </p> */ -class Coordinates implements Comparable<Coordinates> { +final class Coordinates implements Comparable<Coordinates> { private final String groupId; diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java index 42574fea..acb8927b 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java @@ -25,7 +25,6 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; @@ -362,7 +361,7 @@ public class ResolveDependenciesMojo extends AbstractResolveMojo { artifactStringList.add(message + System.lineSeparator()); } if (theSort) { - Collections.sort(artifactStringList); + artifactStringList.sort(null); } for (String artifactString : artifactStringList) { sb.append(artifactString); diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/VerboseJavaScopeSelector.java b/src/main/java/org/apache/maven/plugins/dependency/tree/VerboseJavaScopeSelector.java index 54240b1f..c62d8cc7 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/tree/VerboseJavaScopeSelector.java +++ b/src/main/java/org/apache/maven/plugins/dependency/tree/VerboseJavaScopeSelector.java @@ -46,8 +46,7 @@ class VerboseJavaScopeSelector extends ScopeSelector { .flatMap(i -> i.getScopes().stream()) .distinct() .filter(ORDERED_SCOPES::contains) - .max(Comparator.comparingInt((String s) -> ORDERED_SCOPES.indexOf(s)) - .reversed()) + .max(Comparator.comparingInt(ORDERED_SCOPES::indexOf).reversed()) .filter(s -> !s.equals(context.getScope())) .ifPresent(s -> context.getWinner().getNode().setData(REDUCED_SCOPE, s)); } diff --git a/src/main/java/org/apache/maven/plugins/dependency/utils/filters/ResolveFileFilter.java b/src/main/java/org/apache/maven/plugins/dependency/utils/filters/ResolveFileFilter.java index 6225d7e7..87fa082e 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/utils/filters/ResolveFileFilter.java +++ b/src/main/java/org/apache/maven/plugins/dependency/utils/filters/ResolveFileFilter.java @@ -39,7 +39,7 @@ public class ResolveFileFilter extends MarkerFileFilter { public boolean isArtifactIncluded(ArtifactItem item) throws ArtifactFilterException { handler.setArtifact(item.getArtifact()); try { - return (!handler.isMarkerSet()); + return !handler.isMarkerSet(); } catch (MojoExecutionException e) { throw new ArtifactFilterException(e.getMessage(), e); } diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/DependencyVersionResolverTest.java b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/DependencyVersionResolverTest.java index 37b3c894..f2642f89 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/DependencyVersionResolverTest.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/DependencyVersionResolverTest.java @@ -90,7 +90,7 @@ class DependencyVersionResolverTest { assertEquals(Arrays.asList(main, sources), index.get(DependencyVersionResolver.GroupArtifactKey.from(main))); assertEquals(Arrays.asList(other), index.get(DependencyVersionResolver.GroupArtifactKey.from(other))); - assertThrows(UnsupportedOperationException.class, () -> index.clear()); + assertThrows(UnsupportedOperationException.class, index::clear); assertThrows( UnsupportedOperationException.class, () -> index.get(DependencyVersionResolver.GroupArtifactKey.from(main)) diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java index 292a1614..cab1cc5e 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java @@ -848,7 +848,7 @@ class TestCopyMojo { // files only: a directory created for an item's output path is not a copied artifact String[] names = outputDirectory.list((dir, name) -> new File(dir, name).isFile()); List<String> files = names == null ? new ArrayList<>() : new ArrayList<>(Arrays.asList(names)); - Collections.sort(files); + files.sort(null); return files; } diff --git a/src/test/java/org/apache/maven/plugins/dependency/tree/TreeTokensTest.java b/src/test/java/org/apache/maven/plugins/dependency/tree/TreeTokensTest.java index 59dbfc25..28b7030f 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/tree/TreeTokensTest.java +++ b/src/test/java/org/apache/maven/plugins/dependency/tree/TreeTokensTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.plugins.dependency.tree; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -122,7 +122,7 @@ class TreeTokensTest { capabilities("FUTURE_DESTINATION", "UTF-8"), capabilities("CONSOLE", null), capabilities("CONSOLE", 42), - capabilities("CONSOLE", Charset.forName("UTF-8"))); + capabilities("CONSOLE", StandardCharsets.UTF_8)); } private static Map<Object, Object> capabilities(Object destination, Object encoding) { diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java b/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java index a3e8717b..5afbc646 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java +++ b/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java @@ -181,7 +181,7 @@ class TestUnpackMarkerFileHandler { handler.setMarker(); assertTrue(handler.isMarkerSet()); assertTrue(handle.exists()); - String hashCode = "" + ("**/*.xml".hashCode()); + String hashCode = String.valueOf("**/*.xml".hashCode()); assertTrue(handle.getName().contains(hashCode)); handle.delete(); @@ -204,7 +204,7 @@ class TestUnpackMarkerFileHandler { handler.setMarker(); assertTrue(handler.isMarkerSet()); assertTrue(handle.exists()); - String hashCode = "" + ("**/*.class".hashCode()); + String hashCode = String.valueOf("**/*.class".hashCode()); assertTrue(handle.getName().contains(hashCode)); handle.delete(); @@ -227,7 +227,7 @@ class TestUnpackMarkerFileHandler { handler.setMarker(); assertTrue(handler.isMarkerSet()); assertTrue(handle.exists()); - String hashCode = "" + (0 + "**/*.class".hashCode() + "**/*.xml".hashCode()); + String hashCode = String.valueOf(0 + "**/*.class".hashCode() + "**/*.xml".hashCode()); assertTrue(handle.getName().contains(hashCode)); handle.delete();
