Maven Shared Components

ProjectTransitivityFilter has incorrect behavior for artifactIsADirectDependency method

Details

  • Number of attachments :
    0

Description

In the class org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter, the filter should only include items that are part of the direct dependencies. However, the method that does this check (artifactIsADirectDependency) only verifies that a dependency has the same artifactId and groupId as a direct dependency. It should also check the classifier and type. I've included an updated version of the method below:

public boolean artifactIsADirectDependency( Artifact artifact )
{
    boolean result = false;
    Iterator iterator = this.directDependencies.iterator();
    while ( iterator.hasNext() )
    {
        Artifact dependency = (Artifact) iterator.next();
        if ( dependency.getGroupId().equals( artifact.getGroupId() ) &&
            dependency.getArtifactId().equals( artifact.getArtifactId() ) &&
            dependency.getClassifier().equals( artifact.getClassifier() ) &&
            dependency.getType().equals( artifact.getType() ) )
        {
            result = true;
            break;
        }
    }
    return result;
}

Activity

Ascending order - Click to sort in descending order
Hide
Permalink
Owen Kellett added a comment -

Update: Due to the possibility of null values for classifier and type, you need to account for this possibility. I'm using the org.codehaus.plexus.util.StringUtils from the plexus-utils package in the update below:

public boolean artifactIsADirectDependency( Artifact artifact )
{
    boolean result = false;
    Iterator iterator = this.directDependencies.iterator();
    while ( iterator.hasNext() )
    {
        Artifact dependency = (Artifact) iterator.next();
        if ( StringUtils.equals(dependency.getGroupId(), artifact.getGroupId()) &&
             StringUtils.equals(dependency.getArtifactId(), artifact.getArtifactId()) &&
             StringUtils.equals(dependency.getClassifier(), artifact.getClassifier()) &&
             StringUtils.equals(dependency.getType(), artifact.getType())) {
        {
            result = true;
            break;
        }
    }
    return result;
}
Show
Owen Kellett added a comment - Update: Due to the possibility of null values for classifier and type, you need to account for this possibility. I'm using the org.codehaus.plexus.util.StringUtils from the plexus-utils package in the update below: public boolean artifactIsADirectDependency( Artifact artifact ) { boolean result = false ; Iterator iterator = this .directDependencies.iterator(); while ( iterator.hasNext() ) { Artifact dependency = (Artifact) iterator.next(); if ( StringUtils.equals(dependency.getGroupId(), artifact.getGroupId()) && StringUtils.equals(dependency.getArtifactId(), artifact.getArtifactId()) && StringUtils.equals(dependency.getClassifier(), artifact.getClassifier()) && StringUtils.equals(dependency.getType(), artifact.getType())) { { result = true ; break ; } } return result; }
Hide
Permalink
Arnaud Heritier added a comment -

In fact an Artifact Object has its own equals method that we can use here.

Show
Arnaud Heritier added a comment - In fact an Artifact Object has its own equals method that we can use here.
Hide
Permalink
Arnaud Heritier added a comment -

Done. Thx

Show
Arnaud Heritier added a comment - Done. Thx

People

  • Assignee:
    Arnaud Heritier
    Reporter:
    Owen Kellett
Vote (0)
Watch (0)

Dates

  • Created:
    Updated:
    Resolved: