Oh, look at that button. Does that convert everything to correct java5 ??
<3 IntelliJ Idea. Don't leave home without it !
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1517354 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java b/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
index 3170db7..f6ab71f 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
@@ -320,7 +320,7 @@
String url = repo;
// if it's an extended repo URL of the form id::layout::url
- if ( repo.indexOf( "::" ) >= 0 )
+ if (repo.contains("::"))
{
Matcher matcher = ALT_REPO_SYNTAX_PATTERN.matcher( repo );
if ( !matcher.matches() )
diff --git a/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java b/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
index cff9d91..6ed34ff 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
@@ -313,7 +313,7 @@
return;
}
- Set<Artifact> dependencyArtifacts = null;
+ Set<Artifact> dependencyArtifacts;
try
{
diff --git a/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeReportMojo.java b/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeReportMojo.java
index 4944c44..8fefa7c 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeReportMojo.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeReportMojo.java
@@ -130,7 +130,7 @@
}
// Step 1: Analyze the project
- ProjectDependencyAnalysis analysis = null;
+ ProjectDependencyAnalysis analysis;
try
{
analysis = analyzer.analyze( project );
diff --git a/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java b/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
index 2b7337e..227aded 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
@@ -310,7 +310,7 @@
}
// transform artifacts if classifier is set
- DependencyStatusSets status = null;
+ DependencyStatusSets status;
if ( StringUtils.isNotEmpty( classifier ) )
{
status = getClassifierTranslatedDependencies( artifacts, stopOnFailure );
diff --git a/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java b/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
index 0a0ab8c..3caf0dc 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
@@ -234,7 +234,7 @@
try
{
- String dependencyTreeString = null;
+ String dependencyTreeString;
// TODO: note that filter does not get applied due to MNG-3236
diff --git a/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java b/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
index db93a26..9347876 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
@@ -125,7 +125,7 @@
destFileName.append( artifact.getGroupId() ).append( "." );
}
- String versionString = null;
+ String versionString;
if ( !removeVersion )
{
if ( useBaseVersion )
diff --git a/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java b/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
index 27d9c69..95792e2 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
@@ -281,7 +281,7 @@
removeVersion, this.outputFileDirectory, artifact );
}
- File destFile = null;
+ File destFile;
if ( StringUtils.isEmpty( item.getDestFileName() ) )
{
destFile = new File( destFolder, DependencyUtil.getFormattedFileName( artifact, this.removeVersion ) );
diff --git a/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java b/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java
index 76ec940..18e354e 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java
@@ -52,7 +52,7 @@
* parameters, this will allow an artifact to be included multiple
* times with different include/exclude parameters
*/
- File markerFile = null;
+ File markerFile;
if ( this.artifactItem == null || ( StringUtils.isEmpty( this.artifactItem.getIncludes() )
&& StringUtils.isEmpty( this.artifactItem.getExcludes() ) ) )
{
diff --git a/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java b/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java
index bf3d307..2852f0d 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java
@@ -56,7 +56,7 @@
*/
public Set<Artifact> translate( Set<Artifact> artifacts, Log log )
{
- Set<Artifact> results = artifacts;
+ Set<Artifact> results;
log.debug( "Translating Artifacts using Classifier: " + this.classifier + " and Type: " + this.type );
results = new HashSet<Artifact>();
@@ -65,7 +65,7 @@
// this translator must pass both type and classifier here so we
// will use the
// base artifact value if null comes in
- String useType = null;
+ String useType;
if ( StringUtils.isNotEmpty( this.type ) )
{
useType = this.type;
@@ -75,7 +75,7 @@
useType = artifact.getType();
}
- String useClassifier = null;
+ String useClassifier;
if ( StringUtils.isNotEmpty( this.classifier ) )
{
useClassifier = this.classifier;
diff --git a/src/test/java/org/apache/maven/plugin/dependency/TestSkip.java b/src/test/java/org/apache/maven/plugin/dependency/TestSkip.java
index cb76fce..b50de6c 100644
--- a/src/test/java/org/apache/maven/plugin/dependency/TestSkip.java
+++ b/src/test/java/org/apache/maven/plugin/dependency/TestSkip.java
@@ -166,7 +166,7 @@
mojo.setLog( log );
mojo.execute();
- assertTrue( log.getContent().indexOf( "Skipping plugin execution" ) != -1 );
+ assertTrue(log.getContent().contains("Skipping plugin execution"));
}
class CapturingLog
diff --git a/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDuplicateMojo.java b/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDuplicateMojo.java
index a0df543..c31a832 100644
--- a/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDuplicateMojo.java
+++ b/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDuplicateMojo.java
@@ -45,10 +45,9 @@
mojo.setLog( log );
mojo.execute();
- assertTrue( log.getContent().indexOf(
- "List of duplicate dependencies defined in <dependencies/> in "
- + "your pom.xml" ) != -1 );
- assertTrue( log.getContent().indexOf( "junit:junit:jar" ) != -1 );
+ assertTrue(log.getContent().contains("List of duplicate dependencies defined in <dependencies/> in "
+ + "your pom.xml"));
+ assertTrue(log.getContent().contains("junit:junit:jar"));
}
public void testDuplicate2()
@@ -62,10 +61,9 @@
mojo.setLog( log );
mojo.execute();
- assertTrue( log.getContent().indexOf(
- "List of duplicate dependencies defined in <dependencyManagement/> in "
- + "your pom.xml" ) != -1 );
- assertTrue( log.getContent().indexOf( "junit:junit:jar" ) != -1 );
+ assertTrue(log.getContent().contains("List of duplicate dependencies defined in <dependencyManagement/> in "
+ + "your pom.xml"));
+ assertTrue(log.getContent().contains("junit:junit:jar"));
}
class DuplicateLog
diff --git a/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestBuildClasspathMojo.java b/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestBuildClasspathMojo.java
index 459cb57..959ab1f 100644
--- a/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestBuildClasspathMojo.java
+++ b/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestBuildClasspathMojo.java
@@ -65,7 +65,7 @@
project.setDependencyArtifacts( directArtifacts );
mojo.execute();
- String file = null;
+ String file;
try
{
file = mojo.readClasspathFile();
@@ -84,8 +84,8 @@
assertNotNull( file );
assertTrue( file.length() > 0 );
- assertTrue( file.indexOf( File.pathSeparator ) >= 0 );
- assertTrue( file.indexOf( File.separator ) >= 0 );
+ assertTrue(file.contains(File.pathSeparator));
+ assertTrue(file.contains(File.separator));
String fileSep = "#####";
String pathSep = "%%%%%";
@@ -98,10 +98,10 @@
assertNotNull( file );
assertTrue( file.length() > 0 );
- assertFalse( file.indexOf( File.pathSeparator ) >= 0 );
- assertFalse( file.indexOf( File.separator ) >= 0 );
- assertTrue( file.indexOf( fileSep ) >= 0 );
- assertTrue( file.indexOf( pathSep ) >= 0 );
+ assertFalse(file.contains(File.pathSeparator));
+ assertFalse(file.contains(File.separator));
+ assertTrue(file.contains(fileSep));
+ assertTrue(file.contains(pathSep));
String propertyValue = project.getProperties().getProperty( "outputProperty" );
assertNull( propertyValue );
diff --git a/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestUnpackDependenciesMojo.java b/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestUnpackDependenciesMojo.java
index aa23254..e4811eb 100644
--- a/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestUnpackDependenciesMojo.java
+++ b/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestUnpackDependenciesMojo.java
@@ -126,11 +126,8 @@
throws Exception
{
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(artifact);
}
}
@@ -139,11 +136,8 @@
{
mojo.excludeTransitive = true;
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getDependencyArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getDependencyArtifacts()) {
+ assertUnpacked(artifact);
}
}
@@ -155,12 +149,8 @@
mojo.excludeTypes = "jar";
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
-
- assertUnpacked( !artifact.getType().equalsIgnoreCase( "jar" ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(!artifact.getType().equalsIgnoreCase("jar"), artifact);
}
}
@@ -174,11 +164,8 @@
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( !artifact.getScope().equals( "provided" ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(!artifact.getScope().equals("provided"), artifact);
}
}
@@ -193,11 +180,8 @@
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( !artifact.getScope().equals( "system" ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(!artifact.getScope().equals("system"), artifact);
}
}
@@ -211,11 +195,8 @@
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.excludeScope );
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( !saf.include( artifact ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(!saf.include(artifact), artifact);
}
}
@@ -247,11 +228,8 @@
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.excludeScope );
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( !saf.include( artifact ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(!saf.include(artifact), artifact);
}
}
@@ -295,11 +273,8 @@
mojo.useSubDirectoryPerType = true;
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(artifact);
}
}
@@ -309,11 +284,8 @@
mojo.useSubDirectoryPerArtifact = true;
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(artifact);
}
}
@@ -326,11 +298,8 @@
mojo.useSubDirectoryPerType = true;
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(artifact);
}
}
@@ -341,11 +310,8 @@
mojo.stripVersion = true;
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(artifact);
}
}
@@ -359,11 +325,8 @@
mojo.stripVersion = true;
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(artifact);
}
}
@@ -376,11 +339,8 @@
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.includeScope );
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( saf.include( artifact ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(saf.include(artifact), artifact);
}
}
@@ -394,11 +354,8 @@
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.includeScope );
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( saf.include( artifact ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(saf.include(artifact), artifact);
}
}
@@ -411,11 +368,8 @@
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.includeScope );
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( saf.include( artifact ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(saf.include(artifact), artifact);
}
}
@@ -427,11 +381,8 @@
mojo.includeScope = "provided";
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(Artifact.SCOPE_PROVIDED.equals(artifact.getScope()), artifact);
}
}
@@ -444,11 +395,8 @@
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(Artifact.SCOPE_SYSTEM.equals(artifact.getScope()), artifact);
}
}
@@ -492,11 +440,8 @@
// test - get all direct dependencies and verify that they exist if they
// do not have a classifier of "one"
// then delete the file and at the end, verify the folder is empty.
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( !artifact.getArtifactId().equals( "one" ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(!artifact.getArtifactId().equals("one"), artifact);
}
}
@@ -508,11 +453,8 @@
mojo.excludeGroupIds = "one";
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- assertUnpacked( !artifact.getGroupId().equals( "one" ), artifact );
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
+ assertUnpacked(!artifact.getGroupId().equals("one"), artifact);
}
}
@@ -577,27 +519,21 @@
mojo.execute();
- Iterator<Artifact> iter = mojo.getProject().getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
-
+ for (Artifact artifact : (Iterable<Artifact>) mojo.getProject().getArtifacts()) {
String useClassifier = artifact.getClassifier();
String useType = artifact.getType();
- if ( StringUtils.isNotEmpty( testClassifier ) )
- {
+ if (StringUtils.isNotEmpty(testClassifier)) {
useClassifier = testClassifier;
// type is only used if classifier is used.
- if ( StringUtils.isNotEmpty( testType ) )
- {
+ if (StringUtils.isNotEmpty(testType)) {
useType = testType;
}
}
Artifact unpacked =
- stubFactory.createArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- Artifact.SCOPE_COMPILE, useType, useClassifier );
- assertUnpacked( unpacked );
+ stubFactory.createArtifact(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
+ Artifact.SCOPE_COMPILE, useType, useClassifier);
+ assertUnpacked(unpacked);
}
}
diff --git a/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java b/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java
index 178bc7d..c82e4e9 100644
--- a/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java
+++ b/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java
@@ -111,12 +111,9 @@
{
String path = System.getProperty( "java.library.path" );
String[] paths = StringUtils.split( path, System.getProperty( "path.separator" ) );
- for ( int j = 0; j < paths.length; j++ )
- {
- String pt = paths[j];
- if ( new File( pt, "mvn" ).exists() )
- {
- System.setProperty( "maven.home", new File( pt ).getAbsoluteFile().getParent() );
+ for (String pt : paths) {
+ if (new File(pt, "mvn").exists()) {
+ System.setProperty("maven.home", new File(pt).getAbsoluteFile().getParent());
break;
}
diff --git a/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java b/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java
index ec9f23b..a88828b 100644
--- a/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java
+++ b/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java
@@ -37,7 +37,7 @@
{
File pom = new File( getBasedir(), "plugin-config2.xml" );
MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
+ Model model;
try
{
diff --git a/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java b/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java
index 83f3241..0b87c9a 100644
--- a/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java
+++ b/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java
@@ -37,7 +37,7 @@
{
File pom = new File( getBasedir(), "plugin-config.xml" );
MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
+ Model model;
try
{
diff --git a/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java b/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java
index 53c99af..b15d5f3 100644
--- a/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java
+++ b/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java
@@ -35,7 +35,7 @@
protected File getMarkerFile()
{
- File markerFile = null;
+ File markerFile;
if ( this.artifactItem == null
|| ( StringUtils.isEmpty( this.artifactItem.getIncludes() )
&& StringUtils.isEmpty( this.artifactItem.getExcludes() ) ) )
diff --git a/src/test/java/org/apache/maven/plugin/dependency/tree/TestTreeMojo.java b/src/test/java/org/apache/maven/plugin/dependency/tree/TestTreeMojo.java
index c4c1d76..57298d8 100644
--- a/src/test/java/org/apache/maven/plugin/dependency/tree/TestTreeMojo.java
+++ b/src/test/java/org/apache/maven/plugin/dependency/tree/TestTreeMojo.java
@@ -173,7 +173,7 @@
BufferedReader fp1 = new BufferedReader( new FileReader( outputFileName ) );
List<String> contents = new ArrayList<String>();
- String line = null;
+ String line;
while ( ( line = fp1.readLine() ) != null )
{
contents.add( line );
@@ -192,7 +192,7 @@
{
for ( String line : contents )
{
- if ( line.indexOf( str ) != -1 )
+ if (line.contains(str))
{
// if match then return here
return true;
diff --git a/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestUnpackMarkerFileHandler.java b/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestUnpackMarkerFileHandler.java
index 70c0927..8cc629f 100644
--- a/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestUnpackMarkerFileHandler.java
+++ b/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestUnpackMarkerFileHandler.java
@@ -59,7 +59,8 @@
stubFactory = new DependencyArtifactStubFactory( this.testDir, false );
Artifact artifact = stubFactory.createArtifact( "test", "test", "1" );
- ArtifactItem artifactItem = stubFactory.getArtifactItem( artifact );
+ ArtifactItem artifactItem;
+ stubFactory.getArtifactItem(artifact);
artifactItems.add( stubFactory.getArtifactItem( stubFactory.createArtifact( "test", "test", "1" ) ) );
artifact = stubFactory.createArtifact( "test2", "test2", "2" );
artifactItem = new ArtifactItem( artifact );
@@ -218,8 +219,8 @@
handler.setMarker();
assertTrue( handler.isMarkerSet() );
assertTrue( handle.exists() );
- String hashCode = "" + ( 0 + "**/*.xml".hashCode() );
- assertTrue( handle.getName().indexOf( hashCode ) > -1 );
+ String hashCode = "" + ("**/*.xml".hashCode());
+ assertTrue(handle.getName().contains(hashCode));
handle.delete();
assertFalse( handler.isMarkerSet() );
@@ -242,8 +243,8 @@
handler.setMarker();
assertTrue( handler.isMarkerSet() );
assertTrue( handle.exists() );
- String hashCode = "" + ( 0 + "**/*.class".hashCode() );
- assertTrue( handle.getName().indexOf( hashCode ) > -1 );
+ String hashCode = "" + ("**/*.class".hashCode());
+ assertTrue(handle.getName().contains(hashCode));
handle.delete();
assertFalse( handler.isMarkerSet() );
@@ -267,7 +268,7 @@
assertTrue( handler.isMarkerSet() );
assertTrue( handle.exists() );
String hashCode = "" + ( 0 + "**/*.class".hashCode() + "**/*.xml".hashCode() );
- assertTrue( handle.getName().indexOf( hashCode ) > -1 );
+ assertTrue(handle.getName().contains(hashCode));
handle.delete();
assertFalse( handler.isMarkerSet() );
