Author: hboutemy
Date: Sun Sep 2 15:22:49 2012
New Revision: 1379994
URL: http://svn.apache.org/viewvc?rev=1379994&view=rev
Log:
added generics
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/SimpleFilter.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/SimpleFilterTest.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ArtifactSelectorTest.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorParameterTest.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerParameterTests.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
Sun Sep 2 15:22:49 2012
@@ -64,10 +64,10 @@ public class DefaultShader
public void shade( ShadeRequest shadeRequest )
throws IOException, MojoExecutionException
{
- Set resources = new HashSet();
+ Set<String> resources = new HashSet<String>();
ResourceTransformer manifestTransformer = null;
- List transformers = new ArrayList(
shadeRequest.getResourceTransformers() );
+ List<ResourceTransformer> transformers = new
ArrayList<ResourceTransformer>( shadeRequest.getResourceTransformers() );
for ( Iterator<ResourceTransformer> it = transformers.iterator();
it.hasNext(); )
{
ResourceTransformer transformer = it.next();
@@ -88,9 +88,9 @@ public class DefaultShader
for ( File jar : shadeRequest.getJars() )
{
JarFile jarFile = newJarFile( jar );
- for ( Enumeration en = jarFile.entries();
en.hasMoreElements(); )
+ for ( Enumeration<JarEntry> en = jarFile.entries();
en.hasMoreElements(); )
{
- JarEntry entry = (JarEntry) en.nextElement();
+ JarEntry entry = en.nextElement();
String resource = entry.getName();
if ( manifestTransformer.canTransformResource( resource ) )
{
@@ -111,7 +111,7 @@ public class DefaultShader
getLogger().debug( "Processing JAR " + jar );
- List jarFilters = getFilters( jar, shadeRequest.getFilters() );
+ List<Filter> jarFilters = getFilters( jar,
shadeRequest.getFilters() );
JarFile jarFile = newJarFile( jar );
@@ -181,10 +181,8 @@ public class DefaultShader
jarFile.close();
}
- for ( Iterator i = transformers.iterator(); i.hasNext(); )
+ for ( ResourceTransformer transformer : transformers )
{
- ResourceTransformer transformer = (ResourceTransformer) i.next();
-
if ( transformer.hasTransformedResource() )
{
transformer.modifyOutputStream( jos );
@@ -230,7 +228,7 @@ public class DefaultShader
return list;
}
- private void addDirectory( Set resources, JarOutputStream jos, String name
)
+ private void addDirectory( Set<String> resources, JarOutputStream jos,
String name )
throws IOException
{
if ( name.lastIndexOf( '/' ) > 0 )
@@ -341,7 +339,7 @@ public class DefaultShader
return resourceTransformed;
}
- private void addJavaSource( Set resources, JarOutputStream jos, String
name, InputStream is,
+ private void addJavaSource( Set<String> resources, JarOutputStream jos,
String name, InputStream is,
List<Relocator> relocators )
throws IOException
{
@@ -360,7 +358,7 @@ public class DefaultShader
resources.add( name );
}
- private void addResource( Set resources, JarOutputStream jos, String name,
InputStream is )
+ private void addResource( Set<String> resources, JarOutputStream jos,
String name, InputStream is )
throws IOException
{
jos.putNextEntry( new JarEntry( name ) );
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/SimpleFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/SimpleFilter.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/SimpleFilter.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/SimpleFilter.java
Sun Sep 2 15:22:49 2012
@@ -40,7 +40,7 @@ public class SimpleFilter
public SimpleFilter( Set<File> jars, Set<String> includes, Set<String>
excludes )
{
- this.jars = ( jars != null ) ? new HashSet( jars ) : new HashSet();
+ this.jars = ( jars != null ) ? new HashSet<File>( jars ) : new
HashSet<File>();
this.includes = normalizePatterns( includes );
this.excludes = normalizePatterns( excludes );
}
@@ -108,7 +108,7 @@ public class SimpleFilter
return ( path != null ) ? path.replace( File.separatorChar == '/' ?
'\\' : '/', File.separatorChar ) : null;
}
- private Set normalizePatterns( Set<String> patterns )
+ private Set<String> normalizePatterns( Set<String> patterns )
{
Set<String> result = new HashSet<String>();
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Sun Sep 2 15:22:49 2012
@@ -139,7 +139,7 @@ public class ShadeMojo
* Remote repositories which will be searched for source attachments.
*/
@Parameter( readonly = true, required = true, defaultValue =
"${project.remoteArtifactRepositories}" )
- protected List remoteArtifactRepositories;
+ protected List<ArtifactRepository> remoteArtifactRepositories;
/**
* Local maven repository.
@@ -436,10 +436,8 @@ public class ShadeMojo
}
}
- for ( Iterator it = project.getArtifacts().iterator(); it.hasNext(); )
+ for ( Artifact artifact : project.getArtifacts() )
{
- Artifact artifact = (Artifact) it.next();
-
if ( !artifactSelector.isSelected( artifact ) )
{
getLog().info( "Excluding " + artifact.getId() + " from the
shaded jar." );
@@ -699,28 +697,22 @@ public class ShadeMojo
artifacts.put( project.getArtifact(), new ArtifactId(
project.getArtifact() ) );
- for ( Iterator it = project.getArtifacts().iterator();
it.hasNext(); )
+ for ( Artifact artifact : project.getArtifacts() )
{
- Artifact artifact = (Artifact) it.next();
-
artifacts.put( artifact, new ArtifactId( artifact ) );
}
- for ( int i = 0; i < this.filters.length; i++ )
+ for ( ArchiveFilter filter : this.filters )
{
- ArchiveFilter filter = this.filters[i];
-
ArtifactId pattern = new ArtifactId( filter.getArtifact() );
Set<File> jars = new HashSet<File>();
- for ( Iterator it = artifacts.entrySet().iterator();
it.hasNext(); )
+ for ( Map.Entry<Artifact, ArtifactId> entry :
artifacts.entrySet() )
{
- Map.Entry entry = (Map.Entry) it.next();
-
- if ( ( (ArtifactId) entry.getValue() ).matches( pattern ) )
+ if ( entry.getValue().matches( pattern ) )
{
- Artifact artifact = (Artifact) entry.getKey();
+ Artifact artifact = entry.getKey();
jars.add( artifact.getFile() );
@@ -813,10 +805,8 @@ public class ShadeMojo
List<Dependency> transitiveDeps = new ArrayList<Dependency>();
- for ( Iterator it = project.getArtifacts().iterator(); it.hasNext(); )
+ for ( Artifact artifact : project.getArtifacts() )
{
- Artifact artifact = (Artifact) it.next();
-
if ( "pom".equals( artifact.getType() ) )
{
// don't include pom type dependencies in dependency reduced
pom
@@ -847,10 +837,8 @@ public class ShadeMojo
origDeps = transitiveDeps;
}
- for ( Iterator<Dependency> i = origDeps.iterator(); i.hasNext(); )
+ for ( Dependency d : origDeps )
{
- Dependency d = i.next();
-
dependencies.add( d );
String id = getId( d );
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
Sun Sep 2 15:22:49 2012
@@ -24,6 +24,8 @@ import java.io.InputStream;
import java.util.List;
import java.util.jar.JarOutputStream;
+import org.apache.maven.plugins.shade.relocation.Relocator;
+
/**
* Prevents duplicate copies of the license
*/
@@ -37,16 +39,11 @@ public class ApacheLicenseResourceTransf
public boolean canTransformResource( String resource )
{
- if ( LICENSE_PATH.equalsIgnoreCase( resource )
- || LICENSE_TXT_PATH.regionMatches( true, 0, resource, 0,
LICENSE_TXT_PATH.length() ) )
- {
- return true;
- }
-
- return false;
+ return LICENSE_PATH.equalsIgnoreCase( resource )
+ || LICENSE_TXT_PATH.regionMatches( true, 0, resource, 0,
LICENSE_TXT_PATH.length() );
}
- public void processResource( String resource, InputStream is, List
relocators )
+ public void processResource( String resource, InputStream is,
List<Relocator> relocators )
throws IOException
{
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
Sun Sep 2 15:22:49 2012
@@ -31,7 +31,6 @@ import java.io.PrintWriter;
import java.io.Writer;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -49,7 +48,7 @@ public class ApacheNoticeResourceTransfo
{
Set<String> entries = new LinkedHashSet<String>();
- Map organizationEntries = new LinkedHashMap();
+ Map<String, Set<String>> organizationEntries = new LinkedHashMap<String,
Set<String>>();
String projectName = ""; // MSHADE-101 :: NullPointerException when
projectName is missing
@@ -128,7 +127,7 @@ public class ApacheNoticeResourceTransfo
String line = reader.readLine();
StringBuffer sb = new StringBuffer();
- Set currentOrg = null;
+ Set<String> currentOrg = null;
int lineCount = 0;
while ( line != null )
{
@@ -144,10 +143,10 @@ public class ApacheNoticeResourceTransfo
if ( lineCount == 1
&& sb.toString().indexOf( "This product
includes/uses software(s) developed by" ) != -1 )
{
- currentOrg = (Set) organizationEntries.get(
sb.toString().trim() );
+ currentOrg = organizationEntries.get(
sb.toString().trim() );
if ( currentOrg == null )
{
- currentOrg = new TreeSet();
+ currentOrg = new TreeSet<String>();
organizationEntries.put( sb.toString().trim(),
currentOrg );
}
sb = new StringBuffer();
@@ -220,10 +219,9 @@ public class ApacheNoticeResourceTransfo
PrintWriter writer = new PrintWriter( pow );
int count = 0;
- for ( Iterator itr = entries.iterator(); itr.hasNext(); )
+ for ( String line : entries )
{
++count;
- String line = (String) itr.next();
if ( line.equals( copyright ) && count != 2 )
{
continue;
@@ -242,15 +240,13 @@ public class ApacheNoticeResourceTransfo
if ( count == 3 )
{
//do org stuff
- for ( Iterator oit =
organizationEntries.entrySet().iterator(); oit.hasNext(); )
+ for ( Map.Entry<String, Set<String>> entry :
organizationEntries.entrySet() )
{
- Map.Entry entry = (Map.Entry) oit.next();
- writer.print( entry.getKey().toString() );
+ writer.print( entry.getKey() );
writer.print( '\n' );
- Set entrySet = (Set) entry.getValue();
- for ( Iterator eit = entrySet.iterator(); eit.hasNext(); )
+ for ( String l : entry.getValue() )
{
- writer.print( eit.next().toString() );
+ writer.print( l );
}
writer.print( '\n' );
}
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
Sun Sep 2 15:22:49 2012
@@ -33,7 +33,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.Writer;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -163,9 +162,8 @@ public class ComponentsXmlResourceTransf
dom.addChild( componentDom );
- for ( Iterator i = components.values().iterator(); i.hasNext(); )
+ for ( Xpp3Dom component : components.values() )
{
- Xpp3Dom component = (Xpp3Dom) i.next();
componentDom.addChild( component );
}
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
Sun Sep 2 15:22:49 2012
@@ -24,7 +24,6 @@ import org.codehaus.plexus.util.IOUtil;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.jar.Attributes;
@@ -48,7 +47,7 @@ public class ManifestResourceTransformer
// Configuration
private String mainClass;
- private Map manifestEntries;
+ private Map<String, Attributes> manifestEntries;
// Fields
private boolean manifestDiscovered;
@@ -102,10 +101,9 @@ public class ManifestResourceTransformer
if ( manifestEntries != null )
{
- for ( Iterator i = manifestEntries.keySet().iterator();
i.hasNext(); )
+ for ( Map.Entry<String,Attributes> entry :
manifestEntries.entrySet() )
{
- String key = (String) i.next();
- attributes.put( new Attributes.Name( key ),
manifestEntries.get( key ) );
+ attributes.put( new Attributes.Name( entry.getKey() ),
entry.getValue() );
}
}
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
Sun Sep 2 15:22:49 2012
@@ -98,9 +98,10 @@ public class XmlAppendingTransformer
{
Element root = r.getRootElement();
- for ( Iterator itr = root.getAttributes().iterator();
itr.hasNext(); )
+ for ( @SuppressWarnings( "unchecked" )
+ Iterator<Attribute> itr = root.getAttributes().iterator();
itr.hasNext(); )
{
- Attribute a = (Attribute) itr.next();
+ Attribute a = itr.next();
itr.remove();
Element mergedEl = doc.getRootElement();
@@ -111,9 +112,10 @@ public class XmlAppendingTransformer
}
}
- for ( Iterator itr = root.getChildren().iterator(); itr.hasNext();
)
+ for ( @SuppressWarnings( "unchecked" )
+ Iterator<Content> itr = root.getChildren().iterator();
itr.hasNext(); )
{
- Content n = (Content) itr.next();
+ Content n = itr.next();
itr.remove();
doc.getRootElement().addContent( n );
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
Sun Sep 2 15:22:49 2012
@@ -30,8 +30,11 @@ import java.net.URL;
import junit.framework.TestCase;
+import org.apache.maven.plugins.shade.filter.Filter;
+import org.apache.maven.plugins.shade.relocation.Relocator;
import org.apache.maven.plugins.shade.relocation.SimpleRelocator;
import
org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer;
+import org.apache.maven.plugins.shade.resource.ResourceTransformer;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
@@ -57,31 +60,31 @@ public class DefaultShaderTest
{
Shader s = newShader();
- Set set = new LinkedHashSet();
+ Set<File> set = new LinkedHashSet<File>();
set.add( new File( "src/test/jars/test-artifact-1.0-SNAPSHOT.jar" ) );
- List relocators = new ArrayList();
+ List<Relocator> relocators = new ArrayList<Relocator>();
relocators.add( new SimpleRelocator( "org.apache.maven.plugins.shade",
null, null, null ) );
- List resourceTransformers = new ArrayList();
+ List<ResourceTransformer> resourceTransformers = new
ArrayList<ResourceTransformer>();
- List filters = new ArrayList();
+ List<Filter> filters = new ArrayList<Filter>();
File file = new File(
"target/testShaderWithStaticInitializedClass.jar" );
ShadeRequest shadeRequest = new ShadeRequest();
- shadeRequest.setJars(set);
- shadeRequest.setUberJar(file);
- shadeRequest.setFilters(filters);
- shadeRequest.setRelocators(relocators);
- shadeRequest.setResourceTransformers(resourceTransformers);
+ shadeRequest.setJars( set );
+ shadeRequest.setUberJar( file );
+ shadeRequest.setFilters( filters );
+ shadeRequest.setRelocators( relocators );
+ shadeRequest.setResourceTransformers( resourceTransformers );
s.shade( shadeRequest );
URLClassLoader cl = new URLClassLoader( new
URL[]{file.toURI().toURL()} );
- Class c = cl.loadClass( "hidden.org.apache.maven.plugins.shade.Lib" );
+ Class<?> c = cl.loadClass( "hidden.org.apache.maven.plugins.shade.Lib"
);
Object o = c.newInstance();
assertEquals( "foo.bar/baz", c.getDeclaredField( "CONSTANT" ).get( o )
);
}
@@ -104,28 +107,28 @@ public class DefaultShaderTest
{
DefaultShader s = newShader();
- Set set = new LinkedHashSet();
+ Set<File> set = new LinkedHashSet<File>();
set.add( new File( "src/test/jars/test-project-1.0-SNAPSHOT.jar" ) );
set.add( new File( "src/test/jars/plexus-utils-1.4.1.jar" ) );
- List relocators = new ArrayList();
+ List<Relocator> relocators = new ArrayList<Relocator>();
relocators.add( new SimpleRelocator( "org/codehaus/plexus/util",
shadedPattern, null, Arrays.asList( excludes ) ) );
- List resourceTransformers = new ArrayList();
+ List<ResourceTransformer> resourceTransformers = new
ArrayList<ResourceTransformer>();
resourceTransformers.add( new ComponentsXmlResourceTransformer() );
- List filters = new ArrayList();
+ List<Filter> filters = new ArrayList<Filter>();
ShadeRequest shadeRequest = new ShadeRequest();
- shadeRequest.setJars(set);
- shadeRequest.setUberJar(jar);
- shadeRequest.setFilters(filters);
- shadeRequest.setRelocators(relocators);
- shadeRequest.setResourceTransformers(resourceTransformers);
+ shadeRequest.setJars( set );
+ shadeRequest.setUberJar( jar );
+ shadeRequest.setFilters( filters );
+ shadeRequest.setRelocators( relocators );
+ shadeRequest.setResourceTransformers( resourceTransformers );
s.shade( shadeRequest );
}
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/SimpleFilterTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/SimpleFilterTest.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/SimpleFilterTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/SimpleFilterTest.java
Sun Sep 2 15:22:49 2012
@@ -38,37 +38,37 @@ public class SimpleFilterTest
assertFalse( filter.isFiltered( "a.properties" ) );
assertFalse( filter.isFiltered( "org/Test.class" ) );
- filter = new SimpleFilter( null, Collections.EMPTY_SET,
Collections.EMPTY_SET );
+ filter = new SimpleFilter( null, Collections.<String> emptySet(),
Collections.<String> emptySet() );
assertFalse( filter.isFiltered( "a.properties" ) );
assertFalse( filter.isFiltered( "org/Test.class" ) );
- filter = new SimpleFilter( null, Collections.singleton(
"org/Test.class" ), Collections.EMPTY_SET );
+ filter = new SimpleFilter( null, Collections.singleton(
"org/Test.class" ), Collections.<String> emptySet() );
assertTrue( filter.isFiltered( "a.properties" ) );
assertFalse( filter.isFiltered( "org/Test.class" ) );
assertTrue( filter.isFiltered( "org/Test.properties" ) );
- filter = new SimpleFilter( null, Collections.EMPTY_SET,
Collections.singleton( "org/Test.class" ) );
+ filter = new SimpleFilter( null, Collections.<String> emptySet(),
Collections.singleton( "org/Test.class" ) );
assertFalse( filter.isFiltered( "a.properties" ) );
assertTrue( filter.isFiltered( "org/Test.class" ) );
assertFalse( filter.isFiltered( "org/Test.properties" ) );
- filter = new SimpleFilter( null, Collections.singleton(
"**/a.properties" ), Collections.EMPTY_SET );
+ filter = new SimpleFilter( null, Collections.singleton(
"**/a.properties" ), Collections.<String> emptySet() );
assertFalse( filter.isFiltered( "a.properties" ) );
assertFalse( filter.isFiltered( "org/a.properties" ) );
assertFalse( filter.isFiltered( "org/maven/a.properties" ) );
assertTrue( filter.isFiltered( "org/maven/a.class" ) );
- filter = new SimpleFilter( null, Collections.EMPTY_SET,
Collections.singleton( "org/*" ) );
+ filter = new SimpleFilter( null, Collections.<String> emptySet(),
Collections.singleton( "org/*" ) );
assertFalse( filter.isFiltered( "Test.class" ) );
assertTrue( filter.isFiltered( "org/Test.class" ) );
assertFalse( filter.isFiltered( "org/apache/Test.class" ) );
- filter = new SimpleFilter( null, Collections.EMPTY_SET,
Collections.singleton( "org/**" ) );
+ filter = new SimpleFilter( null, Collections.<String> emptySet(),
Collections.singleton( "org/**" ) );
assertFalse( filter.isFiltered( "Test.class" ) );
assertTrue( filter.isFiltered( "org/Test.class" ) );
assertTrue( filter.isFiltered( "org/apache/Test.class" ) );
- filter = new SimpleFilter( null, Collections.EMPTY_SET,
Collections.singleton( "org/" ) );
+ filter = new SimpleFilter( null, Collections.<String> emptySet(),
Collections.singleton( "org/" ) );
assertFalse( filter.isFiltered( "Test.class" ) );
assertTrue( filter.isFiltered( "org/Test.class" ) );
assertTrue( filter.isFiltered( "org/apache/Test.class" ) );
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ArtifactSelectorTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ArtifactSelectorTest.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ArtifactSelectorTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ArtifactSelectorTest.java
Sun Sep 2 15:22:49 2012
@@ -31,7 +31,7 @@ public class ArtifactSelectorTest
extends TestCase
{
- private ArtifactSelector newSelector( Collection includes, Collection
excludes, String groupPrefix )
+ private ArtifactSelector newSelector( Collection<String> includes,
Collection<String> excludes, String groupPrefix )
{
return new ArtifactSelector( includes, excludes, groupPrefix );
}
@@ -51,14 +51,14 @@ public class ArtifactSelectorTest
assertTrue( selector.isSelected( new ArtifactId( "gid.test", "aid",
"type", "cls" ) ) );
assertFalse( selector.isSelected( new ArtifactId( "id", "aid", "type",
"cls" ) ) );
- selector = newSelector( Collections.EMPTY_SET, Collections.EMPTY_SET,
null );
+ selector = newSelector( Collections.<String> emptySet(),
Collections.<String> emptySet(), null );
assertTrue( selector.isSelected( new ArtifactId( "gid", "aid", "type",
"cls" ) ) );
- selector = newSelector( Collections.singleton( "gid:aid" ),
Collections.EMPTY_SET, null );
+ selector = newSelector( Collections.singleton( "gid:aid" ),
Collections.<String> emptySet(), null );
assertTrue( selector.isSelected( new ArtifactId( "gid", "aid", "type",
"cls" ) ) );
assertFalse( selector.isSelected( new ArtifactId( "gid", "id", "type",
"cls" ) ) );
- selector = newSelector( Collections.EMPTY_SET, Collections.singleton(
"gid:aid" ), null );
+ selector = newSelector( Collections.<String> emptySet(),
Collections.singleton( "gid:aid" ), null );
assertFalse( selector.isSelected( new ArtifactId( "gid", "aid",
"type", "cls" ) ) );
assertTrue( selector.isSelected( new ArtifactId( "gid", "id", "type",
"cls" ) ) );
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
Sun Sep 2 15:22:49 2012
@@ -35,6 +35,7 @@ import org.apache.maven.plugins.shade.fi
import org.apache.maven.plugins.shade.relocation.Relocator;
import org.apache.maven.plugins.shade.relocation.SimpleRelocator;
import
org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer;
+import org.apache.maven.plugins.shade.resource.ResourceTransformer;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
@@ -75,28 +76,28 @@ public class ShadeMojoTest
Shader s = (Shader) lookup( Shader.ROLE, "default" );
- Set set = new LinkedHashSet();
+ Set<File> set = new LinkedHashSet<File>();
set.add( new File( getBasedir(),
"src/test/jars/test-artifact-1.0-SNAPSHOT.jar" ) );
List<Relocator> relocators = new ArrayList<Relocator>();
relocators.add( new SimpleRelocator( "org.codehaus.plexus.util",
"hidden", null, Arrays.asList(
new String[]{ "org.codehaus.plexus.util.xml.Xpp3Dom",
"org.codehaus.plexus.util.xml.pull.*" } ) ) );
- List resourceTransformers = new ArrayList();
+ List<ResourceTransformer> resourceTransformers = new
ArrayList<ResourceTransformer>();
- List filters = new ArrayList();
+ List<Filter> filters = new ArrayList<Filter>();
ShadeRequest shadeRequest = new ShadeRequest();
- shadeRequest.setJars(set);
- shadeRequest.setUberJar(jarFile);
- shadeRequest.setFilters(filters);
- shadeRequest.setRelocators(relocators);
- shadeRequest.setResourceTransformers(resourceTransformers);
+ shadeRequest.setJars( set );
+ shadeRequest.setUberJar( jarFile );
+ shadeRequest.setFilters( filters );
+ shadeRequest.setRelocators( relocators );
+ shadeRequest.setResourceTransformers( resourceTransformers );
s.shade( shadeRequest );
ClassLoader cl = new URLClassLoader( new URL[]{
jarFile.toURI().toURL() } );
- Class c = cl.loadClass( "org.apache.maven.plugins.shade.Lib" );
+ Class<?> c = cl.loadClass( "org.apache.maven.plugins.shade.Lib" );
Field field = c.getDeclaredField( "CLASS_REALM_PACKAGE_IMPORT" );
assertEquals( "org.codehaus.plexus.util.xml.pull", field.get( null ) );
@@ -130,7 +131,7 @@ public class ShadeMojoTest
ArtifactResolver mockArtifactResolver = new DefaultArtifactResolver()
{
- public void resolve( Artifact artifact, List remoteRepos,
ArtifactRepository repo )
+ public void resolve( Artifact artifact, List<ArtifactRepository>
remoteRepos, ArtifactRepository repo )
throws ArtifactResolutionException, ArtifactNotFoundException
{
// artifact is resolved
@@ -173,7 +174,7 @@ public class ShadeMojoTest
// invoke getFilters()
Method getFilters = ShadeMojo.class.getDeclaredMethod( "getFilters",
new Class[0] );
getFilters.setAccessible( true );
- List filters = (List) getFilters.invoke( mojo, new Object[0] );
+ List<Filter> filters = (List<Filter>) getFilters.invoke( mojo, new
Object[0] );
// assertions - there must be one filter
assertEquals( 1, filters.size() );
@@ -189,29 +190,29 @@ public class ShadeMojoTest
{
Shader s = (Shader) lookup( Shader.ROLE );
- Set set = new LinkedHashSet();
+ Set<File> set = new LinkedHashSet<File>();
set.add( new File( getBasedir(),
"src/test/jars/test-project-1.0-SNAPSHOT.jar" ) );
set.add( new File( getBasedir(),
"src/test/jars/plexus-utils-1.4.1.jar" ) );
- List relocators = new ArrayList();
+ List<Relocator> relocators = new ArrayList<Relocator>();
relocators.add( new SimpleRelocator( "org/codehaus/plexus/util",
shadedPattern, null, Arrays.asList(
new String[]{ "org/codehaus/plexus/util/xml/Xpp3Dom",
"org/codehaus/plexus/util/xml/pull.*" } ) ) );
- List resourceTransformers = new ArrayList();
+ List<ResourceTransformer> resourceTransformers = new
ArrayList<ResourceTransformer>();
resourceTransformers.add( new ComponentsXmlResourceTransformer() );
- List filters = new ArrayList();
+ List<Filter> filters = new ArrayList<Filter>();
ShadeRequest shadeRequest = new ShadeRequest();
- shadeRequest.setJars(set);
- shadeRequest.setUberJar(jar);
- shadeRequest.setFilters(filters);
- shadeRequest.setRelocators(relocators);
- shadeRequest.setResourceTransformers(resourceTransformers);
+ shadeRequest.setJars( set );
+ shadeRequest.setUberJar( jar );
+ shadeRequest.setFilters( filters );
+ shadeRequest.setRelocators( relocators );
+ shadeRequest.setResourceTransformers( resourceTransformers );
s.shade( shadeRequest );
}
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorParameterTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorParameterTest.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorParameterTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorParameterTest.java
Sun Sep 2 15:22:49 2012
@@ -48,7 +48,7 @@ public class SimpleRelocatorParameterTes
{
try
{
- new SimpleRelocator( pattern, shadedPattern,
Collections.EMPTY_LIST, Collections.EMPTY_LIST );
+ new SimpleRelocator( pattern, shadedPattern, Collections.<String>
emptyList(), Collections.<String> emptyList() );
}
catch ( NullPointerException e )
{
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerParameterTests.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerParameterTests.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerParameterTests.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerParameterTests.java
Sun Sep 2 15:22:49 2012
@@ -5,6 +5,8 @@ import java.io.IOException;
import java.util.Collections;
import java.util.List;
+import org.apache.maven.plugins.shade.relocation.Relocator;
+
import junit.framework.TestCase;
@@ -30,53 +32,74 @@ import junit.framework.TestCase;
/**
* Tests {@link ApacheLicenseResourceTransformer} parameters.
*/
-public class ApacheNoticeResourceTransformerParameterTests extends TestCase {
+public class ApacheNoticeResourceTransformerParameterTests
+ extends TestCase
+{
private static final String NOTICE_RESOURCE = "META-INF/NOTICE";
private ApacheNoticeResourceTransformer subject;
- protected void setUp() throws Exception {
- super.setUp();
- subject = new ApacheNoticeResourceTransformer();
- }
-
-
- public void testNoParametersShouldNotThrowNullPointerWhenNoInput()
throws IOException {
- processAndFailOnNullPointer("");
- }
-
- public void
testNoParametersShouldNotThrowNullPointerWhenNoLinesOfInput() throws
IOException {
- processAndFailOnNullPointer("Some notice text");
- }
-
- public void
testNoParametersShouldNotThrowNullPointerWhenOneLineOfInput() throws
IOException {
- processAndFailOnNullPointer("Some notice text\n");
- }
-
- public void
testNoParametersShouldNotThrowNullPointerWhenTwoLinesOfInput() throws
IOException {
- processAndFailOnNullPointer("Some notice text\nSome notice
text\n");
- }
-
- public void
testNoParametersShouldNotThrowNullPointerWhenLineStartsWithSlashSlash() throws
IOException {
- processAndFailOnNullPointer("Some notice text\n//Some notice
text\n");
- }
-
- public void
testNoParametersShouldNotThrowNullPointerWhenLineIsSlashSlash() throws
IOException {
- processAndFailOnNullPointer("//\n");
- }
-
- public void testNoParametersShouldNotThrowNullPointerWhenLineIsEmpty()
throws IOException {
- processAndFailOnNullPointer("\n");
- }
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ subject = new ApacheNoticeResourceTransformer();
+ }
- private void processAndFailOnNullPointer(final String noticeText)
- throws IOException {
- try {
- final ByteArrayInputStream noticeInputStream = new
ByteArrayInputStream(noticeText.getBytes());
- final List emptyList = Collections.EMPTY_LIST;
- subject.processResource(NOTICE_RESOURCE,
noticeInputStream, emptyList);
- } catch (NullPointerException e) {
- fail("Null pointer should not be thrown when no
parameters are set.");
- }
- }
+ public void testNoParametersShouldNotThrowNullPointerWhenNoInput()
+ throws IOException
+ {
+ processAndFailOnNullPointer( "" );
+ }
+
+ public void testNoParametersShouldNotThrowNullPointerWhenNoLinesOfInput()
+ throws IOException
+ {
+ processAndFailOnNullPointer( "Some notice text" );
+ }
+
+ public void testNoParametersShouldNotThrowNullPointerWhenOneLineOfInput()
+ throws IOException
+ {
+ processAndFailOnNullPointer( "Some notice text\n" );
+ }
+
+ public void testNoParametersShouldNotThrowNullPointerWhenTwoLinesOfInput()
+ throws IOException
+ {
+ processAndFailOnNullPointer( "Some notice text\nSome notice text\n" );
+ }
+
+ public void
testNoParametersShouldNotThrowNullPointerWhenLineStartsWithSlashSlash()
+ throws IOException
+ {
+ processAndFailOnNullPointer( "Some notice text\n//Some notice text\n"
);
+ }
+
+ public void testNoParametersShouldNotThrowNullPointerWhenLineIsSlashSlash()
+ throws IOException
+ {
+ processAndFailOnNullPointer( "//\n" );
+ }
+
+ public void testNoParametersShouldNotThrowNullPointerWhenLineIsEmpty()
+ throws IOException
+ {
+ processAndFailOnNullPointer( "\n" );
+ }
+
+ private void processAndFailOnNullPointer( final String noticeText )
+ throws IOException
+ {
+ try
+ {
+ final ByteArrayInputStream noticeInputStream = new
ByteArrayInputStream( noticeText.getBytes() );
+ final List<Relocator> emptyList = Collections.emptyList();
+ subject.processResource( NOTICE_RESOURCE, noticeInputStream,
emptyList );
+ }
+ catch ( NullPointerException e )
+ {
+ fail( "Null pointer should not be thrown when no parameters are
set." );
+ }
+ }
}
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java?rev=1379994&r1=1379993&r2=1379994&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
Sun Sep 2 15:22:49 2012
@@ -20,6 +20,8 @@ package org.apache.maven.plugins.shade.r
*/
import junit.framework.TestCase;
+
+import org.apache.maven.plugins.shade.relocation.Relocator;
import org.codehaus.plexus.util.IOUtil;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLAssert;
@@ -50,9 +52,9 @@ public class ComponentsXmlResourceTransf
XMLUnit.setNormalizeWhitespace( true );
transformer.processResource( "components-1.xml",
getClass().getResourceAsStream( "/components-1.xml" ),
- Collections.EMPTY_LIST );
+ Collections.<Relocator> emptyList() );
transformer.processResource( "components-1.xml",
getClass().getResourceAsStream( "/components-2.xml" ),
- Collections.EMPTY_LIST );
+ Collections.<Relocator> emptyList() );
Diff diff = XMLUnit.compareXML(
IOUtil.toString( getClass().getResourceAsStream(
"/components-expected.xml" ), "UTF-8" ),
IOUtil.toString( transformer.getTransformedResource(), "UTF-8" ) );
