Java 5 cleanup.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1717033 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java b/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java
index a4b8d1d..b695af6 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java
@@ -1,7 +1,13 @@
package org.apache.maven.plugins.source.stubs;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Resource;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.codehaus.plexus.util.IOUtil;
@@ -9,11 +15,6 @@
import org.codehaus.plexus.util.xml.XmlStreamReader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -41,9 +42,9 @@
{
private Build build;
- private List resources;
+ private List<Resource> resources;
- private List testResources;
+ private List<Resource> testResources;
public Project001Stub()
{
@@ -67,18 +68,16 @@
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( basedir + "/target/test-classes/unit/project-001/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List testCompileSourceRoots = new ArrayList();
+ List<String> testCompileSourceRoots = new ArrayList<String>();
testCompileSourceRoots.add( basedir + "/target/test-classes/unit/project-001/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
- setResources( model.getBuild()
- .getResources() );
- setTestResources( model.getBuild()
- .getTestResources() );
+ setResources( model.getBuild().getResources() );
+ setTestResources( model.getBuild().getTestResources() );
SourcePluginArtifactStub artifact =
new SourcePluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging(), null );
@@ -104,27 +103,27 @@
this.build = build;
}
- public List getResources()
+ public List<Resource> getResources()
{
- return resources;
+ return this.resources;
}
- public void setResources( List resources )
+ public void setResources( List<Resource> resources )
{
this.resources = resources;
}
- public List getTestResources()
+ public List<Resource> getTestResources()
{
return testResources;
}
- public void setTestResources( List testResources )
+ public void setTestResources( List<Resource> testResources )
{
this.testResources = testResources;
}
- static Model readModelFromFile(File file)
+ static Model readModelFromFile( File file )
throws IOException, XmlPullParserException
{
MavenXpp3Reader pomReader = new MavenXpp3Reader();
@@ -133,10 +132,11 @@
{
reader = ReaderFactory.newXmlReader( file );
return pomReader.read( reader );
- } finally {
+ }
+ finally
+ {
IOUtil.close( reader );
}
-
}
}
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/Project003Stub.java b/src/test/java/org/apache/maven/plugins/source/stubs/Project003Stub.java
index 518c11b..1901b74 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/Project003Stub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/Project003Stub.java
@@ -1,12 +1,14 @@
package org.apache.maven.plugins.source.stubs;
+import static org.apache.maven.plugins.source.stubs.Project001Stub.readModelFromFile;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.Resource;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,9 +30,6 @@
*/
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.codehaus.plexus.util.ReaderFactory;
-
-import static org.apache.maven.plugins.source.stubs.Project001Stub.readModelFromFile;
/**
* @author <a href="mailto:oching@exist.com">Maria Odea Ching</a>
@@ -40,9 +39,9 @@
{
private Build build;
- private List resources;
+ private List<Resource> resources;
- private List testResources;
+ private List<Resource> testResources;
public Project003Stub()
{
@@ -66,11 +65,11 @@
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( basedir + "/target/test-classes/unit/project-003/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List testCompileSourceRoots = new ArrayList();
+ List<String> testCompileSourceRoots = new ArrayList<String>();
testCompileSourceRoots.add( basedir + "/target/test-classes/unit/project-003/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
@@ -101,25 +100,24 @@
this.build = build;
}
- public List getResources()
+ public List<Resource> getResources()
{
return resources;
}
- public void setResources( List resources )
+ public void setResources( List<Resource> resources )
{
this.resources = resources;
}
- public List getTestResources()
+ public List<Resource> getTestResources()
{
return testResources;
}
- public void setTestResources( List testResources )
+ public void setTestResources( List<Resource> testResources )
{
this.testResources = testResources;
}
-
}
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/Project005Stub.java b/src/test/java/org/apache/maven/plugins/source/stubs/Project005Stub.java
index eddabc3..7e96d13 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/Project005Stub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/Project005Stub.java
@@ -1,11 +1,13 @@
package org.apache.maven.plugins.source.stubs;
+import static org.apache.maven.plugins.source.stubs.Project001Stub.readModelFromFile;
+
import java.io.File;
import java.util.List;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.Resource;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,9 +29,6 @@
*/
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.codehaus.plexus.util.ReaderFactory;
-
-import static org.apache.maven.plugins.source.stubs.Project001Stub.readModelFromFile;
/**
* @author <a href="mailto:oching@exist.com">Maria Odea Ching</a>
@@ -39,9 +38,9 @@
{
private Build build;
- private List resources;
+ private List<Resource> resources;
- private List testResources;
+ private List<Resource> testResources;
public Project005Stub()
{
@@ -87,22 +86,22 @@
this.build = build;
}
- public List getResources()
+ public List<Resource> getResources()
{
return resources;
}
- public void setResources( List resources )
+ public void setResources( List<Resource> resources )
{
this.resources = resources;
}
- public List getTestResources()
+ public List<Resource> getTestResources()
{
return testResources;
}
- public void setTestResources( List testResources )
+ public void setTestResources( List<Resource> testResources )
{
this.testResources = testResources;
}
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/Project007Stub.java b/src/test/java/org/apache/maven/plugins/source/stubs/Project007Stub.java
index 8419957..43ed1fd 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/Project007Stub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/Project007Stub.java
@@ -1,12 +1,14 @@
package org.apache.maven.plugins.source.stubs;
+import static org.apache.maven.plugins.source.stubs.Project001Stub.readModelFromFile;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.Resource;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,9 +30,6 @@
*/
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.codehaus.plexus.util.ReaderFactory;
-
-import static org.apache.maven.plugins.source.stubs.Project001Stub.readModelFromFile;
/**
* @author <a href="mailto:oching@exist.com">Maria Odea Ching</a>
@@ -40,9 +39,9 @@
{
private Build build;
- private List resources;
+ private List<Resource> resources;
- private List testResources;
+ private List<Resource> testResources;
public Project007Stub()
{
@@ -65,11 +64,11 @@
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( basedir + "/target/test-classes/unit/project-007/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List testCompileSourceRoots = new ArrayList();
+ List<String> testCompileSourceRoots = new ArrayList<String>();
testCompileSourceRoots.add( basedir + "/target/test-classes/unit/project-007/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
@@ -100,22 +99,22 @@
this.build = build;
}
- public List getResources()
+ public List<Resource> getResources()
{
return resources;
}
- public void setResources( List resources )
+ public void setResources( List<Resource> resources )
{
this.resources = resources;
}
- public List getTestResources()
+ public List<Resource> getTestResources()
{
return testResources;
}
- public void setTestResources( List testResources )
+ public void setTestResources( List<Resource> testResources )
{
this.testResources = testResources;
}
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/Project009Stub.java b/src/test/java/org/apache/maven/plugins/source/stubs/Project009Stub.java
index efa4402..df43792 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/Project009Stub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/Project009Stub.java
@@ -1,5 +1,7 @@
package org.apache.maven.plugins.source.stubs;
+import static org.apache.maven.plugins.source.stubs.Project001Stub.readModelFromFile;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -25,11 +27,8 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.Resource;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.codehaus.plexus.util.ReaderFactory;
-
-import static org.apache.maven.plugins.source.stubs.Project001Stub.readModelFromFile;
/**
* @author Dennis Lundberg
@@ -39,9 +38,9 @@
{
private Build build;
- private List resources;
+ private List<Resource> resources;
- private List testResources;
+ private List<Resource> testResources;
public Project009Stub()
{
@@ -67,11 +66,11 @@
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( basedir + "/target/test-classes/unit/project-009/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List testCompileSourceRoots = new ArrayList();
+ List<String> testCompileSourceRoots = new ArrayList<String>();
testCompileSourceRoots.add( basedir + "/target/test-classes/unit/project-009/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
@@ -101,22 +100,22 @@
this.build = build;
}
- public List getResources()
+ public List<Resource> getResources()
{
return resources;
}
- public void setResources( List resources )
+ public void setResources( List<Resource> resources )
{
this.resources = resources;
}
- public List getTestResources()
+ public List<Resource> getTestResources()
{
return testResources;
}
- public void setTestResources( List testResources )
+ public void setTestResources( List<Resource> testResources )
{
this.testResources = testResources;
}
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/Project010Stub.java b/src/test/java/org/apache/maven/plugins/source/stubs/Project010Stub.java
index 16c50ec..f77bc9c 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/Project010Stub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/Project010Stub.java
@@ -1,5 +1,7 @@
package org.apache.maven.plugins.source.stubs;
+import static org.apache.maven.plugins.source.stubs.Project001Stub.readModelFromFile;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -25,20 +27,17 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.Resource;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.codehaus.plexus.util.ReaderFactory;
-
-import static org.apache.maven.plugins.source.stubs.Project001Stub.readModelFromFile;
public class Project010Stub
extends MavenProjectStub
{
private Build build;
- private List resources;
+ private List<Resource> resources;
- private List testResources;
+ private List<Resource> testResources;
public Project010Stub()
{
@@ -49,38 +48,38 @@
model = readModelFromFile( new File( getBasedir(), "target/test-classes/unit/project-010/pom.xml" ) );
setModel( model );
- setFile(new File( getBasedir(), "target/test-classes/unit/project-010/pom.xml" ));
+ setFile( new File( getBasedir(), "target/test-classes/unit/project-010/pom.xml" ) );
- setGroupId(model.getGroupId());
- setArtifactId(model.getArtifactId());
- setVersion(model.getVersion());
- setName(model.getName());
- setUrl(model.getUrl());
- setPackaging(model.getPackaging());
+ setGroupId( model.getGroupId() );
+ setArtifactId( model.getArtifactId() );
+ setVersion( model.getVersion() );
+ setName( model.getName() );
+ setUrl( model.getUrl() );
+ setPackaging( model.getPackaging() );
Build build = new Build();
build.setFinalName( getArtifactId() + "-" + getVersion() );
- build.setDirectory(getBasedir() + "/target/test/unit/project-010/target");
+ build.setDirectory( getBasedir() + "/target/test/unit/project-010/target" );
- setBuild(build);
+ setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( basedir + "/target/test-classes/unit/project-010/src/main/java" );
- setCompileSourceRoots(compileSourceRoots);
+ setCompileSourceRoots( compileSourceRoots );
- List testCompileSourceRoots = new ArrayList();
- testCompileSourceRoots.add(basedir + "/target/test-classes/unit/project-010/src/test/java");
- setTestCompileSourceRoots(testCompileSourceRoots);
+ List<String> testCompileSourceRoots = new ArrayList<String>();
+ testCompileSourceRoots.add( basedir + "/target/test-classes/unit/project-010/src/test/java" );
+ setTestCompileSourceRoots( testCompileSourceRoots );
- setResources(model.getBuild().getResources());
- setTestResources(model.getBuild().getTestResources());
+ setResources( model.getBuild().getResources() );
+ setTestResources( model.getBuild().getTestResources() );
SourcePluginArtifactStub artifact =
new SourcePluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging(), null );
- artifact.setArtifactHandler(new DefaultArtifactHandlerStub());
- artifact.setType("jar");
- artifact.setBaseVersion("1.0-SNAPSHOT");
+ artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
+ artifact.setType( "jar" );
+ artifact.setBaseVersion( "1.0-SNAPSHOT" );
setArtifact( artifact );
}
@@ -100,22 +99,22 @@
this.build = build;
}
- public List getResources()
+ public List<Resource> getResources()
{
return resources;
}
- public void setResources( List resources )
+ public void setResources( List<Resource> resources )
{
this.resources = resources;
}
- public List getTestResources()
+ public List<Resource> getTestResources()
{
return testResources;
}
- public void setTestResources( List testResources )
+ public void setTestResources( List<Resource> testResources )
{
this.testResources = testResources;
}
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/SourcePluginArtifactStub.java b/src/test/java/org/apache/maven/plugins/source/stubs/SourcePluginArtifactStub.java
index 422b1bb..c09a6df 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/SourcePluginArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/SourcePluginArtifactStub.java
@@ -41,7 +41,7 @@
private String classifier;
private String baseVersion;
-
+
private VersionRange versionRange;
private ArtifactHandler handler;
@@ -144,7 +144,7 @@
{
this.baseVersion = baseVersion;
}
-
+
public ArtifactHandler getArtifactHandler()
{
return handler;
