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-dependency-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 8d7cd808 Remove redundant/unneeded code (#519)
8d7cd808 is described below
commit 8d7cd8085df12880d8fe9c564a25d1cb131d52e5
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Fri Apr 18 21:06:11 2025 +0000
Remove redundant/unneeded code (#519)
---
.../plugins/dependency/analyze/AbstractAnalyzeMojo.java | 17 +++++------------
.../AbstractFromConfigurationMojo.java | 4 ++--
.../dependency/resolvers/ResolvePluginsMojo.java | 2 +-
.../dependency/tree/JsonDependencyNodeVisitor.java | 2 +-
4 files changed, 9 insertions(+), 16 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
index 765b334b..b8867537 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
@@ -383,7 +383,7 @@ public abstract class AbstractAnalyzeMojo extends
AbstractMojo {
logDependencyWarning("Used undeclared dependencies found:");
if (verbose) {
- logArtifacts(usedUndeclaredWithClasses, true);
+ logArtifacts(usedUndeclaredWithClasses);
} else {
logArtifacts(usedUndeclaredWithClasses.keySet(), true);
}
@@ -464,7 +464,7 @@ public abstract class AbstractAnalyzeMojo extends
AbstractMojo {
}
}
- private void logArtifacts(Map<Artifact, Set<String>> artifacts, boolean
warn) {
+ private void logArtifacts(Map<Artifact, Set<String>> artifacts) {
if (artifacts.isEmpty()) {
getLog().info(" None");
} else {
@@ -472,16 +472,9 @@ public abstract class AbstractAnalyzeMojo extends
AbstractMojo {
// called because artifact will set the version to -SNAPSHOT
only if I do this. MNG-2961
entry.getKey().isSnapshot();
- if (warn) {
- logDependencyWarning(" " + entry.getKey());
- for (String clazz : entry.getValue()) {
- logDependencyWarning(" class " + clazz);
- }
- } else {
- getLog().info(" " + entry.getKey());
- for (String clazz : entry.getValue()) {
- getLog().info(" class " + clazz);
- }
+ logDependencyWarning(" " + entry.getKey());
+ for (String clazz : entry.getValue()) {
+ logDependencyWarning(" class " + clazz);
}
}
}
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
index 57d6bb77..f848c98d 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
@@ -162,7 +162,7 @@ public abstract class AbstractFromConfigurationMojo extends
AbstractDependencyMo
boolean removeClassifier =
processArtifactItemsRequest.isRemoveClassifier();
- if (artifactItems == null || artifactItems.size() < 1) {
+ if (artifactItems == null || artifactItems.isEmpty()) {
throw new MojoExecutionException("There are no artifactItems
configured.");
}
@@ -182,7 +182,7 @@ public abstract class AbstractFromConfigurationMojo extends
AbstractDependencyMo
artifactItem.setArtifact(this.getArtifact(artifactItem));
if (artifactItem.getDestFileName() == null
- || artifactItem.getDestFileName().length() == 0) {
+ || artifactItem.getDestFileName().isEmpty()) {
artifactItem.setDestFileName(DependencyUtil.getFormattedFileName(
artifactItem.getArtifact(), removeVersion,
prependGroupId, useBaseVersion, removeClassifier));
}
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
index a8b53bbe..4119af06 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
@@ -110,7 +110,7 @@ public class ResolvePluginsMojo extends AbstractResolveMojo
{
sb.append(System.lineSeparator());
sb.append("The following plugins have been resolved:");
sb.append(System.lineSeparator());
- if (plugins == null || plugins.isEmpty()) {
+ if (plugins.isEmpty()) {
sb.append(" none");
sb.append(System.lineSeparator());
} else {
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/tree/JsonDependencyNodeVisitor.java
b/src/main/java/org/apache/maven/plugins/dependency/tree/JsonDependencyNodeVisitor.java
index 52fd180b..015ce1b2 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/tree/JsonDependencyNodeVisitor.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/tree/JsonDependencyNodeVisitor.java
@@ -56,7 +56,7 @@ public class JsonDependencyNodeVisitor extends
AbstractSerializingVisitor implem
* @param node the node to write
*/
private void writeRootNode(DependencyNode node) {
- Set<DependencyNode> visited = new HashSet<DependencyNode>();
+ Set<DependencyNode> visited = new HashSet<>();
int indent = 2;
StringBuilder sb = new StringBuilder();
sb.append("{").append("\n");
