This is an automated email from the ASF dual-hosted git repository.
michaelo 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 7d679c9 [MDEP-763] Minor improvements
7d679c9 is described below
commit 7d679c9f4ebc2d191997752d7e30b0e1df7957da
Author: Arturo Bernal <[email protected]>
AuthorDate: Sat Sep 4 07:36:36 2021 +0200
[MDEP-763] Minor improvements
* Inline variable
* Avoid explicit
* Redundant 'Collection.addAll()' call
* Make final variables when is possible
* Remove Unnecessary 'toString()'
This closes #160
---
.../maven/plugins/dependency/AbstractDependencyMojo.java | 3 +--
.../maven/plugins/dependency/PurgeLocalRepositoryMojo.java | 4 ++--
.../maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java | 6 +++---
.../maven/plugins/dependency/fromConfiguration/CopyMojo.java | 10 ++++------
.../fromDependencies/AbstractDependencyFilterMojo.java | 3 +--
.../dependency/fromDependencies/BuildClasspathMojo.java | 6 +++---
.../plugins/dependency/resolvers/ResolveDependenciesMojo.java | 2 +-
.../plugins/dependency/tree/CycleBreakerGraphTransformer.java | 4 ++--
.../plugins/dependency/tree/TGFDependencyNodeVisitor.java | 8 ++++----
.../org/apache/maven/plugins/dependency/tree/TreeMojo.java | 2 +-
.../maven/plugins/dependency/utils/filters/DestFileFilter.java | 6 +++---
.../dependency/utils/translators/ClassifierTypeTranslator.java | 2 +-
12 files changed, 26 insertions(+), 30 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 07df9f6..16756cb 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
@@ -324,8 +324,7 @@ public abstract class AbstractDependencyMojo
}
catch ( ArchiverException e )
{
- throw new MojoExecutionException( "Error unpacking file: " + file
+ " to: " + location
- + System.lineSeparator() + e.toString(), e );
+ throw new MojoExecutionException( "Error unpacking file: " + file
+ " to: " + location, e );
}
}
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
index 2249a08..d76f069 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
@@ -234,9 +234,9 @@ public class PurgeLocalRepositoryMojo
private class DirectDependencyFilter
extends AbstractFilter
{
- private Artifact projectArtifact;
+ private final Artifact projectArtifact;
- private List<Dependency> directDependencies;
+ private final List<Dependency> directDependencies;
/**
* Default constructor
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 d2bb601..6ab8073 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
@@ -182,7 +182,7 @@ public abstract class AbstractAnalyzeMojo
* @since 2.10
*/
@Parameter
- private String[] ignoredDependencies = new String[0];
+ private final String[] ignoredDependencies = new String[0];
/**
* List of dependencies that will be ignored if they are used but
undeclared. The filter syntax is:
@@ -201,7 +201,7 @@ public abstract class AbstractAnalyzeMojo
* @since 2.10
*/
@Parameter
- private String[] ignoredUsedUndeclaredDependencies = new String[0];
+ private final String[] ignoredUsedUndeclaredDependencies = new String[0];
/**
* List of dependencies that will be ignored if they are declared but
unused. The filter syntax is:
@@ -220,7 +220,7 @@ public abstract class AbstractAnalyzeMojo
* @since 2.10
*/
@Parameter
- private String[] ignoredUnusedDeclaredDependencies = new String[0];
+ private final String[] ignoredUnusedDeclaredDependencies = new String[0];
// Mojo methods -----------------------------------------------------------
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/CopyMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/CopyMojo.java
index a2f2d35..bebe5f4 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/CopyMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/CopyMojo.java
@@ -59,7 +59,7 @@ public class CopyMojo
* @since 2.7
*/
@Parameter( property = "mdep.prependGroupId", defaultValue = "false" )
- private boolean prependGroupId = false;
+ private final boolean prependGroupId = false;
/**
* Use artifact baseVersion during copy
@@ -138,11 +138,9 @@ public class CopyMojo
@Override
protected ArtifactItemFilter getMarkedArtifactFilter( ArtifactItem item )
{
- ArtifactItemFilter destinationNameOverrideFilter =
- new DestFileFilter( this.isOverWriteReleases(),
this.isOverWriteSnapshots(), this.isOverWriteIfNewer(),
- false, false, false, false, this.stripVersion,
prependGroupId, useBaseVersion,
- item.getOutputDirectory() );
- return destinationNameOverrideFilter;
+ return new DestFileFilter( this.isOverWriteReleases(),
this.isOverWriteSnapshots(), this.isOverWriteIfNewer(),
+ false, false, false, false, this.stripVersion,
prependGroupId, useBaseVersion,
+ item.getOutputDirectory() );
}
/**
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
index b2d066b..93e96c8 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
@@ -468,8 +468,7 @@ public abstract class AbstractDependencyFilterMojo
}
// calculate the skipped artifacts
- Set<Artifact> skippedArtifacts = new LinkedHashSet<>();
- skippedArtifacts.addAll( artifacts );
+ Set<Artifact> skippedArtifacts = new LinkedHashSet<>( artifacts );
skippedArtifacts.removeAll( unMarkedArtifacts );
return new DependencyStatusSets( unMarkedArtifacts, null,
skippedArtifacts );
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
index 0e543af..bcb6dac 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
@@ -78,7 +78,7 @@ public class BuildClasspathMojo
* Strip artifact classifier during copy (only works if prefix is set)
*/
@Parameter( property = "mdep.stripClassifier", defaultValue = "false" )
- private boolean stripClassifier = false;
+ private final boolean stripClassifier = false;
/**
* The prefix to prepend on each dependent artifact. If undefined, the
paths refer to the actual files store in the
@@ -158,7 +158,7 @@ public class BuildClasspathMojo
* @since 2.6
*/
@Parameter( property = "mdep.useBaseVersion", defaultValue = "true" )
- private boolean useBaseVersion = true;
+ private final boolean useBaseVersion = true;
/**
* Maven ProjectHelper
@@ -347,7 +347,7 @@ public class BuildClasspathMojo
}
catch ( IOException ex )
{
- throw new MojoExecutionException( "Error while writing to
classpath file '" + out + "': " + ex.toString(),
+ throw new MojoExecutionException( "Error while writing to
classpath file '" + out,
ex );
}
}
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 73e4c05..c445352 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
@@ -246,7 +246,7 @@ public class ResolveDependenciesMojo
}
}
}
- artifactStringList.add( messageBuilder.toString() +
System.lineSeparator() );
+ artifactStringList.add( messageBuilder + System.lineSeparator() );
}
if ( theSort )
{
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/tree/CycleBreakerGraphTransformer.java
b/src/main/java/org/apache/maven/plugins/dependency/tree/CycleBreakerGraphTransformer.java
index d9afc45..4d25415 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/tree/CycleBreakerGraphTransformer.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/tree/CycleBreakerGraphTransformer.java
@@ -43,7 +43,7 @@ final class CycleBreakerGraphTransformer implements
DependencyGraphTransformer
public DependencyNode transformGraph( DependencyNode dependencyNode,
DependencyGraphTransformationContext context )
{
- flagCycle( dependencyNode, new HashSet<Artifact>(), new
HashSet<DependencyNode>() );
+ flagCycle( dependencyNode, new HashSet<>(), new HashSet<>() );
return dependencyNode;
}
@@ -53,7 +53,7 @@ final class CycleBreakerGraphTransformer implements
DependencyGraphTransformer
if ( ancestors.contains( artifact ) )
{
- node.setChildren( new ArrayList<DependencyNode>() );
+ node.setChildren( new ArrayList<>() );
Map<String, String> newProperties = new HashMap<>(
node.getArtifact().getProperties() );
newProperties.put( "Cycle", "True" );
node.setArtifact( node.getArtifact().setProperties( newProperties
) );
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/tree/TGFDependencyNodeVisitor.java
b/src/main/java/org/apache/maven/plugins/dependency/tree/TGFDependencyNodeVisitor.java
index d08fee0..80c6348 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/tree/TGFDependencyNodeVisitor.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/tree/TGFDependencyNodeVisitor.java
@@ -48,17 +48,17 @@ public class TGFDependencyNodeVisitor
/**
* Edge start.
*/
- private DependencyNode from;
+ private final DependencyNode from;
/**
* Edge end.
*/
- private DependencyNode to;
+ private final DependencyNode to;
/**
* Edge label. (optional)
*/
- private String label;
+ private final String label;
/**
* Build a new EdgeAppender.
@@ -95,7 +95,7 @@ public class TGFDependencyNodeVisitor
/**
* List of edges.
*/
- private List<EdgeAppender> edges = new ArrayList<>();
+ private final List<EdgeAppender> edges = new ArrayList<>();
/**
* Constructor.
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
index f9555a0..e8bb731 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
@@ -375,7 +375,7 @@ public class TreeMojo
DefaultDependencyNode rootNode = new DefaultDependencyNode( null,
convertAetherArtifactToMavenArtifact( node ), null, null, null
);
- rootNode.setChildren( new ArrayList<DependencyNode>() );
+ rootNode.setChildren( new ArrayList<>() );
for ( org.eclipse.aether.graph.DependencyNode child :
node.getChildren() )
{
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/utils/filters/DestFileFilter.java
b/src/main/java/org/apache/maven/plugins/dependency/utils/filters/DestFileFilter.java
index d0afceb..2fe0ab4 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/utils/filters/DestFileFilter.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/utils/filters/DestFileFilter.java
@@ -49,7 +49,7 @@ public class DestFileFilter
private boolean useSubDirectoryPerType;
- private boolean useSubDirectoryPerScope;
+ private final boolean useSubDirectoryPerScope;
private boolean useRepositoryLayout;
@@ -57,9 +57,9 @@ public class DestFileFilter
private boolean removeClassifier;
- private boolean prependGroupId;
+ private final boolean prependGroupId;
- private boolean useBaseVersion;
+ private final boolean useBaseVersion;
private File outputFileDirectory;
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java
b/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java
index a2d385a..9f4759f 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java
@@ -36,7 +36,7 @@ import org.codehaus.plexus.util.StringUtils;
public class ClassifierTypeTranslator
implements ArtifactTranslator
{
- private ArtifactHandlerManager artifactHandlerManager;
+ private final ArtifactHandlerManager artifactHandlerManager;
private String classifier;
