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 765b334b1..b88675377 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 @@ private boolean checkDependencies() throws MojoExecutionException { logDependencyWarning("Used undeclared dependencies found:"); if (verbose) { - logArtifacts(usedUndeclaredWithClasses, true); + logArtifacts(usedUndeclaredWithClasses); } else { logArtifacts(usedUndeclaredWithClasses.keySet(), true); } @@ -464,7 +464,7 @@ private void logArtifacts(Set artifacts, boolean warn) { } } - private void logArtifacts(Map> artifacts, boolean warn) { + private void logArtifacts(Map> artifacts) { if (artifacts.isEmpty()) { getLog().info(" None"); } else { @@ -472,16 +472,9 @@ private void logArtifacts(Map> artifacts, boolean warn) { // 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 57d6bb778..f848c98d5 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 @@ protected List getProcessedArtifactItems(ProcessArtifactItemsReque 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 @@ protected List getProcessedArtifactItems(ProcessArtifactItemsReque 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 a8b53bbef..4119af06c 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 @@ protected void doExecute() throws MojoExecutionException { 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 52fd180b4..015ce1b2d 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 boolean visit(DependencyNode node) { * @param node the node to write */ private void writeRootNode(DependencyNode node) { - Set visited = new HashSet(); + Set visited = new HashSet<>(); int indent = 2; StringBuilder sb = new StringBuilder(); sb.append("{").append("\n");