Author: hboutemy
Date: Tue Sep 20 21:17:48 2011
New Revision: 1173378
URL: http://svn.apache.org/viewvc?rev=1173378&view=rev
Log:
[MSHARED-207] added generics
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassAnalyzer.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DependencyAnalyzer.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitorTest.java
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzerTest.java
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysisTest.java
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassAnalyzer.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassAnalyzer.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassAnalyzer.java
Tue Sep 20 21:17:48 2011
@@ -37,6 +37,6 @@ public interface ClassAnalyzer
// public methods ---------------------------------------------------------
- Set analyze( URL url )
+ Set<String> analyze( URL url )
throws IOException;
}
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.java
Tue Sep 20 21:17:48 2011
@@ -34,13 +34,13 @@ public class CollectorClassFileVisitor
{
// fields -----------------------------------------------------------------
- private final Set classes;
+ private final Set<String> classes;
// constructors -----------------------------------------------------------
public CollectorClassFileVisitor()
{
- classes = new HashSet();
+ classes = new HashSet<String>();
}
// ClassFileVisitor methods -----------------------------------------------
@@ -56,7 +56,7 @@ public class CollectorClassFileVisitor
// public methods ---------------------------------------------------------
- public Set getClasses()
+ public Set<String> getClasses()
{
return classes;
}
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
Tue Sep 20 21:17:48 2011
@@ -39,7 +39,7 @@ public class DefaultClassAnalyzer
/*
* @see
org.apache.maven.shared.dependency.analyzer.ClassAnalyzer#analyze(java.net.URL)
*/
- public Set analyze( URL url )
+ public Set<String> analyze( URL url )
throws IOException
{
CollectorClassFileVisitor visitor = new CollectorClassFileVisitor();
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Tue Sep 20 21:17:48 2011
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.net.URL;
import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
@@ -69,21 +68,21 @@ public class DefaultProjectDependencyAna
{
try
{
- Map artifactClassMap = buildArtifactClassMap( project );
+ Map<Artifact, Set<String>> artifactClassMap =
buildArtifactClassMap( project );
- Set dependencyClasses = buildDependencyClasses( project ,
artifactClassMap );
+ Set<String> dependencyClasses = buildDependencyClasses( project,
artifactClassMap );
- Set declaredArtifacts = buildDeclaredArtifacts( project );
+ Set<Artifact> declaredArtifacts = buildDeclaredArtifacts( project
);
- Set usedArtifacts = buildUsedArtifacts( artifactClassMap,
dependencyClasses );
+ Set<Artifact> usedArtifacts = buildUsedArtifacts(
artifactClassMap, dependencyClasses );
- Set usedDeclaredArtifacts = new LinkedHashSet( declaredArtifacts );
+ Set<Artifact> usedDeclaredArtifacts = new LinkedHashSet<Artifact>(
declaredArtifacts );
usedDeclaredArtifacts.retainAll( usedArtifacts );
- Set usedUndeclaredArtifacts = new LinkedHashSet( usedArtifacts );
+ Set<Artifact> usedUndeclaredArtifacts = new
LinkedHashSet<Artifact>( usedArtifacts );
usedUndeclaredArtifacts = removeAll( usedUndeclaredArtifacts,
declaredArtifacts );
- Set unusedDeclaredArtifacts = new LinkedHashSet( declaredArtifacts
);
+ Set<Artifact> unusedDeclaredArtifacts = new
LinkedHashSet<Artifact>( declaredArtifacts );
unusedDeclaredArtifacts = removeAll( unusedDeclaredArtifacts,
usedArtifacts );
return new ProjectDependencyAnalysis( usedDeclaredArtifacts,
usedUndeclaredArtifacts,
@@ -106,51 +105,50 @@ public class DefaultProjectDependencyAna
* set to exclude
* @return set with remove excluded
*/
- private Set removeAll( Set start, Set remove )
+ private Set<Artifact> removeAll( Set<Artifact> start, Set<Artifact> remove
)
{
- Set results = new LinkedHashSet( start.size() );
- Iterator iter = start.iterator();
- while ( iter.hasNext() )
+ Set<Artifact> results = new LinkedHashSet<Artifact>( start.size() );
+
+ for ( Artifact artifact : start )
{
- Artifact artifact = (Artifact) iter.next();
- Iterator iter2 = remove.iterator();
boolean found = false;
- while ( iter2.hasNext() )
+
+ for ( Artifact artifact2 : remove )
{
- Artifact artifact2 = (Artifact) iter2.next();
if ( artifact.getDependencyConflictId().equals(
artifact2.getDependencyConflictId() ) )
{
found = true;
+ break;
}
}
+
if ( !found )
{
results.add( artifact );
}
}
+
return results;
}
// private methods --------------------------------------------------------
- private Map buildArtifactClassMap( MavenProject project )
+ private Map<Artifact, Set<String>> buildArtifactClassMap( MavenProject
project )
throws IOException
{
- Map artifactClassMap = new LinkedHashMap();
+ Map<Artifact, Set<String>> artifactClassMap = new
LinkedHashMap<Artifact, Set<String>>();
- Set dependencyArtifacts = project.getArtifacts();
+ Set<Artifact> dependencyArtifacts = project.getArtifacts();
- for ( Iterator iterator = dependencyArtifacts.iterator();
iterator.hasNext(); )
+ for ( Artifact artifact : dependencyArtifacts )
{
- Artifact artifact = (Artifact) iterator.next();
-
File file = artifact.getFile();
if ( file != null && file.getName().endsWith( ".jar" ) )
{
URL url = file.toURL();
- Set classes = classAnalyzer.analyze( url );
+ Set<String> classes = classAnalyzer.analyze( url );
artifactClassMap.put( artifact, classes );
}
@@ -159,10 +157,10 @@ public class DefaultProjectDependencyAna
return artifactClassMap;
}
- protected Set buildDependencyClasses( MavenProject project , Map
artifactClassMap )
+ protected Set<String> buildDependencyClasses( MavenProject project,
Map<Artifact, Set<String>> artifactClassMap )
throws IOException
{
- Set dependencyClasses = new HashSet();
+ Set<String> dependencyClasses = new HashSet<String>();
String outputDirectory = project.getBuild().getOutputDirectory();
dependencyClasses.addAll( buildDependencyClasses( outputDirectory ) );
@@ -173,7 +171,7 @@ public class DefaultProjectDependencyAna
return dependencyClasses;
}
- private Set buildDependencyClasses( String path )
+ private Set<String> buildDependencyClasses( String path )
throws IOException
{
URL url = new File( path ).toURI().toURL();
@@ -181,26 +179,24 @@ public class DefaultProjectDependencyAna
return dependencyAnalyzer.analyze( url );
}
- private Set buildDeclaredArtifacts( MavenProject project )
+ private Set<Artifact> buildDeclaredArtifacts( MavenProject project )
{
- Set declaredArtifacts = project.getDependencyArtifacts();
+ Set<Artifact> declaredArtifacts = project.getDependencyArtifacts();
if ( declaredArtifacts == null )
{
- declaredArtifacts = Collections.EMPTY_SET;
+ declaredArtifacts = Collections.<Artifact>emptySet();
}
return declaredArtifacts;
}
- private Set buildUsedArtifacts( Map artifactClassMap, Set
dependencyClasses )
+ private Set<Artifact> buildUsedArtifacts( Map<Artifact, Set<String>>
artifactClassMap, Set<String> dependencyClasses )
{
- Set usedArtifacts = new HashSet();
+ Set<Artifact> usedArtifacts = new HashSet<Artifact>();
- for ( Iterator dependencyIterator = dependencyClasses.iterator();
dependencyIterator.hasNext(); )
+ for ( String className : dependencyClasses )
{
- String className = (String) dependencyIterator.next();
-
Artifact artifact = findArtifactForClassName( artifactClassMap,
className );
if ( artifact != null )
@@ -212,17 +208,13 @@ public class DefaultProjectDependencyAna
return usedArtifacts;
}
- protected Artifact findArtifactForClassName( Map artifactClassMap, String
className )
+ protected Artifact findArtifactForClassName( Map<Artifact, Set<String>>
artifactClassMap, String className )
{
- for ( Iterator artifactIterator =
artifactClassMap.keySet().iterator(); artifactIterator.hasNext(); )
+ for ( Map.Entry<Artifact, Set<String>> entry :
artifactClassMap.entrySet() )
{
- Artifact artifact = (Artifact) artifactIterator.next();
-
- Set artifactClassNames = (Set) artifactClassMap.get( artifact );
-
- if ( artifactClassNames.contains( className ) )
+ if ( entry.getValue().contains( className ) )
{
- return artifact;
+ return entry.getKey();
}
}
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DependencyAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DependencyAnalyzer.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DependencyAnalyzer.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DependencyAnalyzer.java
Tue Sep 20 21:17:48 2011
@@ -37,6 +37,6 @@ public interface DependencyAnalyzer
// public methods ---------------------------------------------------------
- Set analyze( URL url )
+ Set<String> analyze( URL url )
throws IOException;
}
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
Tue Sep 20 21:17:48 2011
@@ -23,6 +23,8 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+
/**
*
*
@@ -33,11 +35,11 @@ public class ProjectDependencyAnalysis
{
// fields -----------------------------------------------------------------
- private final Set usedDeclaredArtifacts;
+ private final Set<Artifact> usedDeclaredArtifacts;
- private final Set usedUndeclaredArtifacts;
+ private final Set<Artifact> usedUndeclaredArtifacts;
- private final Set unusedDeclaredArtifacts;
+ private final Set<Artifact> unusedDeclaredArtifacts;
// constructors -----------------------------------------------------------
@@ -46,27 +48,27 @@ public class ProjectDependencyAnalysis
this( null, null, null );
}
- public ProjectDependencyAnalysis( Set usedDeclaredArtifacts, Set
usedUndeclaredArtifacts,
- Set unusedDeclaredArtifacts )
+ public ProjectDependencyAnalysis( Set<Artifact> usedDeclaredArtifacts,
Set<Artifact> usedUndeclaredArtifacts,
+ Set<Artifact> unusedDeclaredArtifacts )
{
- this.usedDeclaredArtifacts = safeCopy(usedDeclaredArtifacts);
- this.usedUndeclaredArtifacts = safeCopy(usedUndeclaredArtifacts);
- this.unusedDeclaredArtifacts = safeCopy(unusedDeclaredArtifacts);
+ this.usedDeclaredArtifacts = safeCopy( usedDeclaredArtifacts );
+ this.usedUndeclaredArtifacts = safeCopy( usedUndeclaredArtifacts );
+ this.unusedDeclaredArtifacts = safeCopy( unusedDeclaredArtifacts );
}
// public methods ---------------------------------------------------------
- public Set getUsedDeclaredArtifacts()
+ public Set<Artifact> getUsedDeclaredArtifacts()
{
return usedDeclaredArtifacts;
}
- public Set getUsedUndeclaredArtifacts()
+ public Set<Artifact> getUsedUndeclaredArtifacts()
{
return usedUndeclaredArtifacts;
}
- public Set getUnusedDeclaredArtifacts()
+ public Set<Artifact> getUnusedDeclaredArtifacts()
{
return unusedDeclaredArtifacts;
}
@@ -90,22 +92,16 @@ public class ProjectDependencyAnalysis
*/
public boolean equals( Object object )
{
- boolean equals;
-
if ( object instanceof ProjectDependencyAnalysis )
{
ProjectDependencyAnalysis analysis = (ProjectDependencyAnalysis)
object;
- equals = getUsedDeclaredArtifacts().equals(
analysis.getUsedDeclaredArtifacts() )
+ return getUsedDeclaredArtifacts().equals(
analysis.getUsedDeclaredArtifacts() )
&& getUsedUndeclaredArtifacts().equals(
analysis.getUsedUndeclaredArtifacts() )
&& getUnusedDeclaredArtifacts().equals(
analysis.getUnusedDeclaredArtifacts() );
}
- else
- {
- equals = false;
- }
- return equals;
+ return false;
}
/*
@@ -150,8 +146,8 @@ public class ProjectDependencyAnalysis
// private methods --------------------------------------------------------
- private Set safeCopy( Set set )
+ private Set<Artifact> safeCopy( Set<Artifact> set )
{
- return ( set == null ) ? Collections.EMPTY_SET :
Collections.unmodifiableSet( new LinkedHashSet( set ) );
+ return ( set == null ) ? Collections.<Artifact>emptySet() :
Collections.unmodifiableSet( new LinkedHashSet<Artifact>( set ) );
}
}
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java
Tue Sep 20 21:17:48 2011
@@ -41,7 +41,7 @@ public class ASMDependencyAnalyzer
/*
* @see
org.apache.maven.shared.dependency.analyzer.DependencyAnalyzer#analyze(java.net.URL)
*/
- public Set analyze( URL url )
+ public Set<String> analyze( URL url )
throws IOException
{
DependencyClassFileVisitor visitor = new DependencyClassFileVisitor();
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
Tue Sep 20 21:17:48 2011
@@ -38,13 +38,13 @@ public class DependencyClassFileVisitor
{
// fields -----------------------------------------------------------------
- private final Set dependencies;
+ private final Set<String> dependencies;
// constructors -----------------------------------------------------------
public DependencyClassFileVisitor()
{
- dependencies = new HashSet();
+ dependencies = new HashSet<String>();
}
// ClassFileVisitor methods -----------------------------------------------
@@ -68,17 +68,17 @@ public class DependencyClassFileVisitor
{
exception.printStackTrace();
}
- catch (IndexOutOfBoundsException e)
+ catch ( IndexOutOfBoundsException e )
{
- //some bug inside ASM causes an IOB exception. Log it and move on?
- //this happens when the class isn't valid.
- System.out.println("Unable to process: "+ className);
+ // some bug inside ASM causes an IOB exception. Log it and move on?
+ // this happens when the class isn't valid.
+ System.out.println( "Unable to process: " + className );
}
}
// public methods ---------------------------------------------------------
- public Set getDependencies()
+ public Set<String> getDependencies()
{
return dependencies;
}
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
Tue Sep 20 21:17:48 2011
@@ -43,13 +43,13 @@ public class DependencyVisitor
{
// fields -----------------------------------------------------------------
- private final Set classes;
+ private final Set<String> classes;
// constructors -----------------------------------------------------------
public DependencyVisitor()
{
- classes = new HashSet();
+ classes = new HashSet<String>();
}
// ClassVisitor methods ---------------------------------------------------
@@ -124,12 +124,18 @@ public class DependencyVisitor
final Object value )
{
if ( signature == null )
+ {
addDesc( desc );
+ }
else
+ {
addTypeSignature( signature );
+ }
if ( value instanceof Type )
+ {
addType( (Type) value );
+ }
return this;
}
@@ -142,9 +148,13 @@ public class DependencyVisitor
final String[] exceptions )
{
if ( signature == null )
+ {
addMethodDesc( desc );
+ }
else
+ {
addSignature( signature );
+ }
addNames( exceptions );
@@ -218,9 +228,13 @@ public class DependencyVisitor
public void visitTypeInsn( final int opcode, final String desc )
{
if ( desc.charAt( 0 ) == '[' )
+ {
addDesc( desc );
+ }
else
+ {
addName( desc );
+ }
}
/*
@@ -273,7 +287,9 @@ public class DependencyVisitor
public void visitLdcInsn( final Object cst )
{
if ( cst instanceof Type )
+ {
addType( (Type) cst );
+ }
}
/*
@@ -521,7 +537,7 @@ public class DependencyVisitor
// public methods ---------------------------------------------------------
- public Set getClasses()
+ public Set<String> getClasses()
{
return classes;
}
@@ -531,11 +547,15 @@ public class DependencyVisitor
private void addName( String name )
{
if ( name == null )
+ {
return;
+ }
// decode arrays
if ( name.startsWith( "[L" ) && name.endsWith( ";" ) )
+ {
name = name.substring( 2, name.length() - 1 );
+ }
// decode internal representation
name = name.replace( '/', '.' );
@@ -546,10 +566,14 @@ public class DependencyVisitor
private void addNames( final String[] names )
{
if ( names == null )
+ {
return;
+ }
- for ( int i = 0; i < names.length; i++ )
- addName( names[i] );
+ for ( String name : names )
+ {
+ addName( name );
+ }
}
private void addDesc( final String desc )
@@ -563,8 +587,10 @@ public class DependencyVisitor
Type[] types = Type.getArgumentTypes( desc );
- for ( int i = 0; i < types.length; i++ )
- addType( types[i] );
+ for ( Type type : types )
+ {
+ addType( type );
+ }
}
private void addType( final Type t )
@@ -584,12 +610,16 @@ public class DependencyVisitor
private void addSignature( final String signature )
{
if ( signature != null )
+ {
new SignatureReader( signature ).accept( this );
+ }
}
private void addTypeSignature( final String signature )
{
if ( signature != null )
+ {
new SignatureReader( signature ).acceptType( this );
+ }
}
}
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitorTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitorTest.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitorTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitorTest.java
Tue Sep 20 21:17:48 2011
@@ -58,7 +58,7 @@ public class CollectorClassFileVisitorTe
visitor.visitClass( "a.b.c", null );
visitor.visitClass( "x.y.z", null );
- Set expected = new HashSet();
+ Set<String> expected = new HashSet<String>();
expected.add( "a.b.c" );
expected.add( "x.y.z" );
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzerTest.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzerTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzerTest.java
Tue Sep 20 21:17:48 2011
@@ -38,11 +38,13 @@ import org.codehaus.plexus.util.IOUtil;
* @version $Id$
* @see DefaultClassAnalyzer
*/
-public class DefaultClassAnalyzerTest extends AbstractFileTest
+public class DefaultClassAnalyzerTest
+ extends AbstractFileTest
{
// tests ------------------------------------------------------------------
- public void testAnalyzeWithJar() throws IOException
+ public void testAnalyzeWithJar()
+ throws IOException
{
File file = createJar();
JarOutputStream out = new JarOutputStream( new FileOutputStream( file
) );
@@ -50,17 +52,18 @@ public class DefaultClassAnalyzerTest ex
writeEntry( out, "x/y/z.class", "class x.y.z" );
out.close();
- Set expectedClasses = new HashSet();
+ Set<String> expectedClasses = new HashSet<String>();
expectedClasses.add( "a.b.c" );
expectedClasses.add( "x.y.z" );
DefaultClassAnalyzer analyzer = new DefaultClassAnalyzer();
- Set actualClasses = analyzer.analyze( file.toURI().toURL() );
+ Set<String> actualClasses = analyzer.analyze( file.toURI().toURL() );
assertEquals( expectedClasses, actualClasses );
}
- public void testAnalyzeBadJar() throws IOException
+ public void testAnalyzeBadJar()
+ throws IOException
{
//to reproduce MDEP-143
File file = createJar();
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Tue Sep 20 21:17:48 2011
@@ -126,7 +126,7 @@ public class DefaultProjectDependencyAna
Artifact project1 =
createArtifact(
"org.apache.maven.shared.dependency-analyzer.tests",
"jarWithCompileDependency1", "jar",
"1.0", "compile" );
- Set usedDeclaredArtifacts = Collections.singleton( project1 );
+ Set<Artifact> usedDeclaredArtifacts = Collections.singleton( project1
);
ProjectDependencyAnalysis expectedAnalysis = new
ProjectDependencyAnalysis( usedDeclaredArtifacts, null, null );
assertEquals( expectedAnalysis, actualAnalysis );
@@ -144,11 +144,11 @@ public class DefaultProjectDependencyAna
Artifact project1 =
createArtifact(
"org.apache.maven.shared.dependency-analyzer.tests", "jarWithTestDependency1",
"jar",
"1.0", "test" );
- Set usedDeclaredArtifacts = Collections.singleton( project1 );
+ Set<Artifact> usedDeclaredArtifacts = Collections.singleton( project1
);
// TODO: remove workaround for SUREFIRE-300 when 2.3.1 released
Artifact junit = createArtifact( "junit", "junit", "jar", "3.8.1",
"test" );
- Set unusedDeclaredArtifacts = Collections.singleton( junit );
+ Set<Artifact> unusedDeclaredArtifacts = Collections.singleton( junit );
ProjectDependencyAnalysis expectedAnalysis =
new ProjectDependencyAnalysis( usedDeclaredArtifacts, null,
unusedDeclaredArtifacts );
@@ -163,7 +163,7 @@ public class DefaultProjectDependencyAna
{
File pom = getTestFile( "target/test-classes/", pomPath );
Properties properties = new Properties();
- List goals = Arrays.asList( new String[] { "clean", "install" } );
+ List<String> goals = Arrays.asList( "clean", "install" );
File log = new File( pom.getParentFile(), "build.log" );
// TODO: don't install test artifacts to local repository
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysisTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysisTest.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysisTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysisTest.java
Tue Sep 20 21:17:48 2011
@@ -22,6 +22,8 @@ package org.apache.maven.shared.dependen
import java.util.HashSet;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+
import junit.framework.TestCase;
/**
@@ -31,15 +33,16 @@ import junit.framework.TestCase;
* @version $Id$
* @see ProjectDependencyAnalysis
*/
-public class ProjectDependencyAnalysisTest extends TestCase
+public class ProjectDependencyAnalysisTest
+ extends TestCase
{
// tests ------------------------------------------------------------------
public void testConstructor()
{
- Set usedDeclaredArtifacts = new HashSet();
- Set usedUndeclaredArtifacts = new HashSet();
- Set unusedDeclaredArtifacts = new HashSet();
+ Set<Artifact> usedDeclaredArtifacts = new HashSet<Artifact>();
+ Set<Artifact> usedUndeclaredArtifacts = new HashSet<Artifact>();
+ Set<Artifact> unusedDeclaredArtifacts = new HashSet<Artifact>();
ProjectDependencyAnalysis analysis =
new ProjectDependencyAnalysis( usedDeclaredArtifacts,
usedUndeclaredArtifacts, unusedDeclaredArtifacts );
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java?rev=1173378&r1=1173377&r2=1173378&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
Tue Sep 20 21:17:48 2011
@@ -37,7 +37,8 @@ import org.objectweb.asm.Type;
* @version $Id$
* @see DependencyVisitor
*/
-public class DependencyVisitorTest extends TestCase
+public class DependencyVisitorTest
+ extends TestCase
{
// TODO: finish tests
@@ -50,7 +51,8 @@ public class DependencyVisitorTest exten
/*
* @see junit.framework.TestCase#setUp()
*/
- protected void setUp() throws Exception
+ protected void setUp()
+ throws Exception
{
visitor = new DependencyVisitor();
}
@@ -692,7 +694,7 @@ public class DependencyVisitorTest exten
private void assertNoClasses()
{
- assertClasses( Collections.EMPTY_SET );
+ assertClasses( Collections.<String>emptySet() );
}
private void assertClasses( String element )
@@ -712,10 +714,10 @@ public class DependencyVisitorTest exten
private void assertClasses( String[] expectedClasses )
{
- assertClasses( new HashSet( Arrays.asList( expectedClasses ) ) );
+ assertClasses( new HashSet<String>( Arrays.asList( expectedClasses ) )
);
}
- private void assertClasses( Set expectedClasses )
+ private void assertClasses( Set<String> expectedClasses )
{
assertEquals( expectedClasses, visitor.getClasses() );
}
