Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MNG-6713] Fix ExclusionArtifactFilter to respect wildcard exclusions. #269

Merged
merged 2 commits into from Aug 6, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -19,13 +19,13 @@
* under the License.
*/

import java.util.List;

import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Exclusion;

import java.util.List;

/**
* Filter to exclude from a list of artifact patterns.
* Filter to exclude from a list of artifact patterns.
*/
public class ExclusionArtifactFilter implements ArtifactFilter
{
Expand All @@ -41,8 +41,20 @@ public boolean include( Artifact artifact )
{
for ( Exclusion exclusion : exclusions )
{
if ( exclusion.getGroupId().equals( artifact.getGroupId() )
&& exclusion.getArtifactId().equals( artifact.getArtifactId() ) )
if ( "*".equals( exclusion.getGroupId() ) && "*".equals( exclusion.getArtifactId() ) )
rfscholte marked this conversation as resolved.
Show resolved Hide resolved
{
return false;
}
if ( "*".equals( exclusion.getGroupId() ) )
{
return !exclusion.getArtifactId().equals( artifact.getArtifactId() );
}
if ( "*".equals( exclusion.getArtifactId() ) )
{
return !exclusion.getGroupId().equals( artifact.getGroupId() );
}
if ( exclusion.getGroupId().equals( artifact.getGroupId() ) && exclusion.getArtifactId().equals(
artifact.getArtifactId() ) )
{
return false;
}
Expand Down
@@ -0,0 +1,123 @@
package org.apache.maven.artifact.resolver.filter;

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Exclusion;
import org.junit.Before;
import org.junit.Test;

import java.util.Collections;

import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

public class ExclusionArtifactFilterTest
{
private Artifact artifact;

@Before
public void setup()
{
artifact = mock( Artifact.class );
when( artifact.getGroupId() ).thenReturn( "org.apache.maven" );
when( artifact.getArtifactId() ).thenReturn( "maven-core" );
}

@Test
public void testExcludeExact()
{
Exclusion exclusion = new Exclusion();
exclusion.setGroupId( "org.apache.maven" );
exclusion.setArtifactId( "maven-core" );
ExclusionArtifactFilter filter = new ExclusionArtifactFilter( Collections.singletonList( exclusion ) );

assertThat( filter.include( artifact ), is( false ) );
}

@Test
public void testExcludeNoMatch()
{
Exclusion exclusion = new Exclusion();
exclusion.setGroupId( "org.apache.maven" );
exclusion.setArtifactId( "maven-model" );
ExclusionArtifactFilter filter = new ExclusionArtifactFilter( Collections.singletonList( exclusion ) );

assertThat( filter.include( artifact ), is( true ) );
}

@Test
public void testExcludeGroupIdWildcard()
{
Exclusion exclusion = new Exclusion();
exclusion.setGroupId( "*" );
exclusion.setArtifactId( "maven-core" );
ExclusionArtifactFilter filter = new ExclusionArtifactFilter( Collections.singletonList( exclusion ) );

assertThat( filter.include( artifact ), is( false ) );
}


@Test
public void testExcludeGroupIdWildcardNoMatch()
{
Exclusion exclusion = new Exclusion();
exclusion.setGroupId( "*" );
exclusion.setArtifactId( "maven-compat" );
ExclusionArtifactFilter filter = new ExclusionArtifactFilter( Collections.singletonList( exclusion ) );

assertThat( filter.include( artifact ), is( true ) );
}

@Test
public void testExcludeArtifactIdWildcard()
{
Exclusion exclusion = new Exclusion();
exclusion.setGroupId( "org.apache.maven" );
exclusion.setArtifactId( "*" );
ExclusionArtifactFilter filter = new ExclusionArtifactFilter( Collections.singletonList( exclusion ) );

assertThat( filter.include( artifact ), is( false ) );
}

@Test
public void testExcludeArtifactIdWildcardNoMatch()
{
Exclusion exclusion = new Exclusion();
exclusion.setGroupId( "org.apache.groovy" );
exclusion.setArtifactId( "*" );
ExclusionArtifactFilter filter = new ExclusionArtifactFilter( Collections.singletonList( exclusion ) );

assertThat( filter.include( artifact ), is( true ) );
}

@Test
public void testExcludeAllWildcard()
{
Exclusion exclusion = new Exclusion();
exclusion.setGroupId( "*" );
exclusion.setArtifactId( "*" );
ExclusionArtifactFilter filter = new ExclusionArtifactFilter( Collections.singletonList( exclusion ) );

assertThat( filter.include( artifact ), is( false ) );
}
}