Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

* Moved `*` to a constant
This commit is contained in:
Ray Tsang 2019-08-06 09:18:58 -07:00 committed by Robert Scholte
parent 6c5be9ce26
commit 8a1f572910
2 changed files with 142 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
View File

@ -19,16 +19,18 @@ package org.apache.maven.artifact.resolver.filter;
* 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
{
private static final String WILDCARD = "*";
private final List<Exclusion> exclusions;
public ExclusionArtifactFilter( List<Exclusion> exclusions )
@ -41,8 +43,20 @@ public class ExclusionArtifactFilter implements ArtifactFilter
{
for ( Exclusion exclusion : exclusions )
{
if ( exclusion.getGroupId().equals( artifact.getGroupId() )
&& exclusion.getArtifactId().equals( artifact.getArtifactId() ) )
if ( WILDCARD.equals( exclusion.getGroupId() ) && WILDCARD.equals( exclusion.getArtifactId() ) )
{
return false;
}
if ( WILDCARD.equals( exclusion.getGroupId() ) )
{
return !exclusion.getArtifactId().equals( artifact.getArtifactId() );
}
if ( WILDCARD.equals( exclusion.getArtifactId() ) )
{
return !exclusion.getGroupId().equals( artifact.getGroupId() );
}
if ( exclusion.getGroupId().equals( artifact.getGroupId() ) && exclusion.getArtifactId().equals(
artifact.getArtifactId() ) )
{
return false;
}

123
maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java Normal file
View File

@ -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 ) );
}
}