Author: brett
Date: Tue Jun 21 17:31:33 2005
New Revision: 191748
URL: http://svn.apache.org/viewcvs?rev=191748&view=rev
Log:
change artifact resolution result to have a set of artifacts instead of a map,
as everything dealt with them as a collection anyway.
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/trunk/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=191748&r1=191747&r2=191748&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
Tue Jun 21 17:31:33 2005
@@ -126,7 +126,7 @@
FileSet fileSet = new FileSet();
fileSet.setDir( fileList.getDir( getProject() ) );
- for ( Iterator i = result.getArtifacts().values().iterator();
i.hasNext(); )
+ for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
{
Artifact artifact = (Artifact) i.next();
String filename = localRepo.pathOf( artifact );
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=191748&r1=191747&r2=191748&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Tue Jun 21 17:31:33 2005
@@ -157,7 +157,7 @@
artifactResolutionResult = artifactCollector.collect( artifacts,
originatingArtifact, localRepository,
remoteRepositories, source, filter, artifactFactory );
- for ( Iterator i =
artifactResolutionResult.getArtifacts().values().iterator(); i.hasNext(); )
+ for ( Iterator i = artifactResolutionResult.getArtifacts().iterator();
i.hasNext(); )
{
Artifact artifact = (Artifact) i.next();
resolve( artifact, remoteRepositories, localRepository );
Modified:
maven/components/trunk/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java?rev=191748&r1=191747&r2=191748&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
Tue Jun 21 17:31:33 2005
@@ -114,9 +114,9 @@
assertEquals( 2, result.getArtifacts().size() );
- assertTrue( result.getArtifacts().containsKey( g.getId() ) );
+ assertTrue( result.getArtifacts().contains( g ) );
- assertTrue( result.getArtifacts().containsKey( h.getId() ) );
+ assertTrue( result.getArtifacts().contains( h ) );
assertLocalArtifactPresent( g );
@@ -153,9 +153,9 @@
assertEquals( 2, result.getArtifacts().size() );
- assertTrue( result.getArtifacts().containsKey( i.getId() ) );
+ assertTrue( result.getArtifacts().contains( i ) );
- assertTrue( result.getArtifacts().containsKey( j.getId() ) );
+ assertTrue( result.getArtifacts().contains( j ) );
assertLocalArtifactPresent( i );
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java?rev=191748&r1=191747&r2=191748&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
Tue Jun 21 17:31:33 2005
@@ -18,6 +18,8 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
+import java.util.Collections;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
@@ -25,18 +27,16 @@
*/
public class ArtifactResolutionResult
{
- private Map artifacts;
+ private Set artifacts = Collections.EMPTY_SET;
private Map conflicts;
public ArtifactResolutionResult()
{
- artifacts = new HashMap();
-
conflicts = new HashMap();
}
- public Map getArtifacts()
+ public Set getArtifacts()
{
return artifacts;
}
@@ -44,5 +44,10 @@
public Map getConflicts()
{
return conflicts;
+ }
+
+ public void setArtifacts( Set artifacts )
+ {
+ this.artifacts = artifacts;
}
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=191748&r1=191747&r2=191748&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Tue Jun 21 17:31:33 2005
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.HashSet;
/**
* Default implementation of the artifact collector.
@@ -131,20 +132,7 @@
}
}
- //
----------------------------------------------------------------------
- // the dependencies list is keyed by groupId+artifactId+type
- // so it must be 'rekeyed' to the complete id:
- // groupId+artifactId+type+version
- //
----------------------------------------------------------------------
-
- Map artifactResult = result.getArtifacts();
-
- for ( Iterator it = resolvedArtifacts.values().iterator();
it.hasNext(); )
- {
- Artifact artifact = (Artifact) it.next();
-
- artifactResult.put( artifact.getId(), artifact );
- }
+ result.setArtifacts( new HashSet( resolvedArtifacts.values() ) );
return result;
}
Modified:
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?rev=191748&r1=191747&r2=191748&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
(original)
+++
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Tue Jun 21 17:31:33 2005
@@ -23,6 +23,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.PlexusTestCase;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -93,11 +94,26 @@
}
}
- private void collect( ArtifactSpec a )
+ public void testResolveNearest()
throws ArtifactResolutionException
{
- artifactCollector.collect( Collections.singleton( a.artifact ),
projectArtifact.artifact, null, null, source,
- null, artifactFactory );
+ ArtifactSpec a = createArtifact( "a", "1.0" );
+ ArtifactSpec b = a.addDependency( "b", "1.0" );
+ ArtifactSpec c = a.addDependency( "c", "3.0" );
+
+ b.addDependency( "c", "2.0" );
+
+ ArtifactResolutionResult res = collect( a );
+ assertEquals( "Check artifact list",
+ new HashSet( Arrays.asList( new Object[]{a.artifact,
b.artifact, c.artifact} ) ),
+ res.getArtifacts() );
+ }
+
+ private ArtifactResolutionResult collect( ArtifactSpec a )
+ throws ArtifactResolutionException
+ {
+ return artifactCollector.collect( Collections.singleton( a.artifact ),
projectArtifact.artifact, null, null,
+ source, null, artifactFactory );
}
private ArtifactSpec createArtifact( String id, String version )
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=191748&r1=191747&r2=191748&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Tue Jun 21 17:31:33 2005
@@ -561,9 +561,9 @@
metadataSource,
artifactFilter );
- Map resolved = result.getArtifacts();
+ Set resolved = result.getArtifacts();
- for ( Iterator it = resolved.values().iterator();
it.hasNext(); )
+ for ( Iterator it = resolved.iterator(); it.hasNext(); )
{
Artifact artifact = (Artifact) it.next();
@@ -585,12 +585,12 @@
.resolveTransitively( pluginArtifact,
remoteArtifactRepositories, session.getLocalRepository(),
metadataSource, distroProvidedFilter
);
- Map distroProvided = distroProvidedResult.getArtifacts();
+ Set distroProvided = distroProvidedResult.getArtifacts();
List unfilteredArtifactList = new ArrayList( resolved.size() +
distroProvided.size() );
- unfilteredArtifactList.addAll( resolved.values() );
- unfilteredArtifactList.addAll( distroProvided.values() );
+ unfilteredArtifactList.addAll( resolved );
+ unfilteredArtifactList.addAll( distroProvided );
pluginDescriptor.setArtifacts( unfilteredArtifactList );
}
@@ -1020,7 +1020,7 @@
context.getLocalRepository(),
sourceReader, filter );
- project.setArtifacts( new HashSet( result.getArtifacts().values() ) );
+ project.setArtifacts( result.getArtifacts() );
}
// ----------------------------------------------------------------------
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=191748&r1=191747&r2=191748&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Jun 21 17:31:33 2005
@@ -150,7 +150,7 @@
localRepository,
artifactMetadataSource );
- project.setArtifacts( new HashSet( result.getArtifacts().values() ) );
+ project.setArtifacts( result.getArtifacts() );
return project;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
