Author: khmarbaise
Date: Thu Sep 4 17:54:35 2014
New Revision: 1622517
URL: http://svn.apache.org/r1622517
Log:
- Improved code
Make test code more Java 5 like to reduce the number of warnings.
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenZipProject.java
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1622517&r1=1622516&r2=1622517&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Thu Sep 4 17:54:35 2014
@@ -116,6 +116,7 @@ under the License.
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- FIXME: Check for Maven 2.2.1 / Maven 3 compatibility. -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
@@ -147,6 +148,7 @@ under the License.
<version>1.19</version>
</dependency>
+ <!-- FIXME: This can be removed with upgrade to Maven 2.2.1 minimum
version -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java?rev=1622517&r1=1622516&r2=1622517&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
Thu Sep 4 17:54:35 2014
@@ -45,7 +45,7 @@ public class OverlayManagerTest
throws Exception
{
final MavenProjectArtifactsStub project = new
MavenProjectArtifactsStub();
- final List overlays = new ArrayList();
+ final List<Overlay> overlays = new ArrayList<Overlay>();
try
{
final Overlay currentProjectOVerlay = Overlay.createInstance();
@@ -70,7 +70,7 @@ public class OverlayManagerTest
final ArtifactStub first = newWarArtifact( "test", "test-webapp" );
project.addArtifact( first );
- final List overlays = new ArrayList();
+ final List<Overlay> overlays = new ArrayList<Overlay>();
try
{
@@ -97,7 +97,7 @@ public class OverlayManagerTest
final ArtifactStub first = newWarArtifact( "test", "test-webapp" );
project.addArtifact( first );
- final List overlays = new ArrayList();
+ final List<Overlay> overlays = new ArrayList<Overlay>();
overlays.add( new DefaultOverlay( first ) );
try
@@ -125,7 +125,7 @@ public class OverlayManagerTest
final ArtifactStub first = newWarArtifact( "test", "test-webapp" );
project.addArtifact( first );
- final List overlays = new ArrayList();
+ final List<Overlay> overlays = new ArrayList<Overlay>();
overlays.add( new Overlay( "test", "test-webapp-2" ) );
try
@@ -150,7 +150,7 @@ public class OverlayManagerTest
project.addArtifact( first );
project.addArtifact( second );
- final List overlays = new ArrayList();
+ final List<Overlay> overlays = new ArrayList<Overlay>();
overlays.add( new DefaultOverlay( first ) );
final Overlay currentProjectOverlay = Overlay.createInstance();
overlays.add( currentProjectOverlay );
@@ -184,7 +184,7 @@ public class OverlayManagerTest
project.addArtifact( first );
project.addArtifact( second );
- final List overlays = new ArrayList();
+ final List<Overlay> overlays = new ArrayList<Overlay>();
overlays.add( new DefaultOverlay( first ) );
overlays.add( new DefaultOverlay( second ) );
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java?rev=1622517&r1=1622516&r2=1622517&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java
Thu Sep 4 17:54:35 2014
@@ -24,6 +24,8 @@ import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+
public class MavenProject4CopyConstructor
extends MavenProjectBasicStub
{
@@ -35,9 +37,9 @@ public class MavenProject4CopyConstructo
initializeParentFields();
}
- public List getAttachedArtifacts()
+ public List<Artifact> getAttachedArtifacts()
{
- return new LinkedList();
+ return new LinkedList<Artifact>();
}
// to prevent the MavenProject copy constructor from blowing up
@@ -45,15 +47,15 @@ public class MavenProject4CopyConstructo
{
// the pom should be located in the isolated dummy root
super.setFile( new File( getBasedir(), "pom.xml" ) );
- super.setDependencyArtifacts( new HashSet() );
- super.setArtifacts( new HashSet() );
- super.setPluginArtifacts( new HashSet() );
- super.setReportArtifacts( new HashSet() );
- super.setExtensionArtifacts( new HashSet() );
- super.setRemoteArtifactRepositories( new LinkedList() );
- super.setPluginArtifactRepositories( new LinkedList() );
- super.setCollectedProjects( new LinkedList() );
- super.setActiveProfiles( new LinkedList() );
+ super.setDependencyArtifacts( new HashSet<Artifact>() );
+ super.setArtifacts( new HashSet<Artifact>() );
+ super.setPluginArtifacts( new HashSet<Artifact>() );
+ super.setReportArtifacts( new HashSet<Artifact>() );
+ super.setExtensionArtifacts( new HashSet<Artifact>() );
+ super.setRemoteArtifactRepositories( new LinkedList<Artifact>() );
+ super.setPluginArtifactRepositories( new LinkedList<Artifact>() );
+ super.setCollectedProjects( new LinkedList<Artifact>() );
+ super.setActiveProfiles( new LinkedList<Artifact>() );
super.setOriginalModel( null );
super.setExecutionProject( this );
super.setBuild( getBuild() );
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java?rev=1622517&r1=1622516&r2=1622517&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
Thu Sep 4 17:54:35 2014
@@ -31,12 +31,12 @@ import java.util.TreeSet;
public class MavenProjectArtifactsStub
extends MavenProjectBasicStub
{
- TreeSet artifacts;
+ TreeSet<Artifact> artifacts;
public MavenProjectArtifactsStub()
throws Exception
{
- artifacts = new TreeSet();
+ artifacts = new TreeSet<Artifact>();
}
public void addArtifact( ArtifactStub stub )
@@ -44,18 +44,18 @@ public class MavenProjectArtifactsStub
artifacts.add( stub );
}
- public Set getArtifacts()
+ public Set<Artifact> getArtifacts()
{
return artifacts;
}
- public List getDependencies()
+ public List<Dependency> getDependencies()
{
if ( getArtifacts() == null )
{
- return new ArrayList();
+ return new ArrayList<Dependency>();
}
- final List dependencies = new ArrayList();
+ final List<Dependency> dependencies = new ArrayList<Dependency>();
for (Object o : getArtifacts()) {
Artifact a = (Artifact) o;
Dependency dependency = new Dependency();
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java?rev=1622517&r1=1622516&r2=1622517&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java
Thu Sep 4 17:54:35 2014
@@ -19,15 +19,16 @@ package org.apache.maven.plugin.war.stub
* under the License.
*/
-import org.apache.maven.model.Build;
-import org.apache.maven.model.Organization;
-import org.apache.maven.project.MavenProject;
-
import java.io.File;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Organization;
+import org.apache.maven.project.MavenProject;
+
/**
* Stub
*/
@@ -45,9 +46,9 @@ public class MavenProjectBasicStub
properties = new Properties();
}
- public Set getArtifacts()
+ public Set<Artifact> getArtifacts()
{
- return new HashSet();
+ return new HashSet<Artifact>();
}
public String getName()
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenZipProject.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenZipProject.java?rev=1622517&r1=1622516&r2=1622517&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenZipProject.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenZipProject.java
Thu Sep 4 17:54:35 2014
@@ -32,21 +32,21 @@ import org.apache.maven.artifact.Artifac
public class MavenZipProject
extends MavenProject4CopyConstructor
{
- private Set artifacts;
+ private Set<Artifact> artifacts;
public MavenZipProject()
throws Exception
{
super();
- this.artifacts = new HashSet();
+ this.artifacts = new HashSet<Artifact>();
}
- public Set getArtifacts()
+ public Set<Artifact> getArtifacts()
{
return this.artifacts;
}
- public Set getDependencyArtifacts()
+ public Set<Artifact> getDependencyArtifacts()
{
return this.artifacts;
}
