You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/07/16 11:32:53 UTC
[maven-common-artifact-filters] 01/01: (doc) small code cleanup from ide suggestions
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch cleanup1
in repository https://gitbox.apache.org/repos/asf/maven-common-artifact-filters.git
commit 3e8651fa404c7831a9611ac2815277a68a90abb0
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jul 16 13:32:16 2022 +0200
(doc) small code cleanup from ide suggestions
---
.../artifact/filter/ScopeArtifactFilter.java | 34 ++--------
.../ArtifactIncludeFilterTransformer.java | 74 +++++++++-------------
.../transform/EclipseAetherFilterTransformer.java | 45 +++++--------
.../filter/AbstractPatternArtifactFilterTest.java | 2 +-
.../artifact/filter/PatternFilterPerfTest.java | 2 +-
.../ArtifactIncludeFilterTransformerTest.java | 7 +-
6 files changed, 55 insertions(+), 109 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
index e8bce30..d2c9517 100644
--- a/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
+++ b/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
@@ -230,9 +230,9 @@ public class ScopeArtifactFilter
report = true;
}
- if ( report )
+ if ( report && logger.isDebugEnabled() )
{
- logger.debug( "The following scope filters were not used: " + buffer.toString() );
+ logger.debug( "The following scope filters were not used: " + buffer );
}
}
}
@@ -244,34 +244,8 @@ public class ScopeArtifactFilter
*/
public boolean hasMissedCriteria()
{
- boolean report = false;
-
- if ( !nullScopeHit )
- {
- report = true;
- }
- if ( !compileScopeHit )
- {
- report = true;
- }
- if ( !runtimeScopeHit )
- {
- report = true;
- }
- if ( !testScopeHit )
- {
- report = true;
- }
- if ( !providedScopeHit )
- {
- report = true;
- }
- if ( !systemScopeHit )
- {
- report = true;
- }
-
- return report;
+ return !nullScopeHit || !compileScopeHit || !runtimeScopeHit || !testScopeHit || !providedScopeHit
+ || !systemScopeHit;
}
/**
diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeFilterTransformer.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeFilterTransformer.java
index 60e1e7d..833a911 100644
--- a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeFilterTransformer.java
+++ b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeFilterTransformer.java
@@ -22,7 +22,6 @@ package org.apache.maven.shared.artifact.filter.resolve.transform;
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
@@ -86,40 +85,36 @@ public class ArtifactIncludeFilterTransformer implements FilterTransformer<Artif
@Override
public ArtifactFilter transform( final ScopeFilter scopeFilter )
{
- return new ArtifactFilter()
+ return artifact ->
{
- @Override
- public boolean include( Artifact artifact )
+ if ( artifact.getScope() == null )
{
- if ( artifact.getScope() == null )
- {
- return includeNullScope;
- }
-
- boolean isIncluded;
+ return includeNullScope;
+ }
- if ( scopeFilter.getIncluded() != null )
- {
- isIncluded = scopeFilter.getIncluded().contains( artifact.getScope() );
- }
- else
- {
- isIncluded = true;
- }
+ boolean isIncluded;
- boolean isExcluded;
+ if ( scopeFilter.getIncluded() != null )
+ {
+ isIncluded = scopeFilter.getIncluded().contains( artifact.getScope() );
+ }
+ else
+ {
+ isIncluded = true;
+ }
- if ( scopeFilter.getExcluded() != null )
- {
- isExcluded = scopeFilter.getExcluded().contains( artifact.getScope() );
- }
- else
- {
- isExcluded = false;
- }
+ boolean isExcluded;
- return isIncluded && !isExcluded;
+ if ( scopeFilter.getExcluded() != null )
+ {
+ isExcluded = scopeFilter.getExcluded().contains( artifact.getScope() );
+ }
+ else
+ {
+ isExcluded = false;
}
+
+ return isIncluded && !isExcluded;
};
}
@@ -155,20 +150,16 @@ public class ArtifactIncludeFilterTransformer implements FilterTransformer<Artif
filters.add( subFilter.transform( this ) );
}
- return new ArtifactFilter()
+ return artifact ->
{
- @Override
- public boolean include( Artifact artifact )
+ for ( ArtifactFilter filter : filters )
{
- for ( ArtifactFilter filter : filters )
+ if ( filter.include( artifact ) )
{
- if ( filter.include( artifact ) )
- {
- return true;
- }
+ return true;
}
- return false;
}
+ return false;
};
}
@@ -190,13 +181,6 @@ public class ArtifactIncludeFilterTransformer implements FilterTransformer<Artif
@Override
public ArtifactFilter transform( final AbstractFilter filter )
{
- return new ArtifactFilter()
- {
- @Override
- public boolean include( Artifact artifact )
- {
- return filter.accept( new ArtifactIncludeNode( artifact ), null );
- }
- };
+ return artifact -> filter.accept( new ArtifactIncludeNode( artifact ), null );
}
}
diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java
index 2c7c386..543302d 100644
--- a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java
+++ b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java
@@ -37,7 +37,6 @@ import org.apache.maven.shared.artifact.filter.resolve.PatternInclusionsFilter;
import org.apache.maven.shared.artifact.filter.resolve.ScopeFilter;
import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
import org.eclipse.aether.graph.DependencyFilter;
-import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.util.filter.AndDependencyFilter;
import org.eclipse.aether.util.filter.ExclusionsDependencyFilter;
import org.eclipse.aether.util.filter.OrDependencyFilter;
@@ -128,16 +127,12 @@ public class EclipseAetherFilterTransformer
@Override
public DependencyFilter transform( final AbstractFilter filter )
{
- return new DependencyFilter()
+ return ( node, parents ) ->
{
- @Override
- public boolean accept( DependencyNode node, List<DependencyNode> parents )
- {
- requireNonNull( node, "node cannot be null" );
- requireNonNull( parents, "parents cannot be null" );
+ requireNonNull( node, "node cannot be null" );
+ requireNonNull( parents, "parents cannot be null" );
- return filter.accept( new EclipseAetherNode( node ), null );
- }
+ return filter.accept( new EclipseAetherNode( node ), null );
};
}
@@ -156,28 +151,22 @@ public class EclipseAetherFilterTransformer
final String classifier = matcher.group( 2 );
- DependencyFilter classifierFilter = new DependencyFilter()
+ filters.add( new AndDependencyFilter( patternFilter, ( node, parents ) ->
{
- @Override
- public boolean accept( DependencyNode node, List<DependencyNode> parents )
+ requireNonNull( node, "node cannot be null" );
+ requireNonNull( parents, "parents cannot be null" );
+
+ String nodeClassifier = node.getArtifact().getClassifier();
+
+ if ( nodeClassifier == null )
{
- requireNonNull( node, "node cannot be null" );
- requireNonNull( parents, "parents cannot be null" );
-
- String nodeClassifier = node.getArtifact().getClassifier();
-
- if ( nodeClassifier == null )
- {
- return false;
- }
- else
- {
- return "*".equals( classifier ) || nodeClassifier.matches( classifier );
- }
+ return false;
}
- };
-
- filters.add( new AndDependencyFilter( patternFilter, classifierFilter ) );
+ else
+ {
+ return "*".equals( classifier ) || nodeClassifier.matches( classifier );
+ }
+ } ) );
}
else
{
diff --git a/src/test/java/org/apache/maven/shared/artifact/filter/AbstractPatternArtifactFilterTest.java b/src/test/java/org/apache/maven/shared/artifact/filter/AbstractPatternArtifactFilterTest.java
index 2a6d914..41b70ca 100644
--- a/src/test/java/org/apache/maven/shared/artifact/filter/AbstractPatternArtifactFilterTest.java
+++ b/src/test/java/org/apache/maven/shared/artifact/filter/AbstractPatternArtifactFilterTest.java
@@ -475,7 +475,7 @@ public abstract class AbstractPatternArtifactFilterTest
when( artifact2.getArtifactId() ).thenReturn( otherArtifact );
when( artifact2.getType() ).thenReturn( otherType );
when( artifact2.getBaseVersion() ).thenReturn( "version" );
- when( artifact2.getDependencyTrail() ).thenReturn( Collections.<String> emptyList() );
+ when( artifact2.getDependencyTrail() ).thenReturn( Collections.emptyList() );
final ArtifactFilter filter = createFilter( patterns, true );
diff --git a/src/test/java/org/apache/maven/shared/artifact/filter/PatternFilterPerfTest.java b/src/test/java/org/apache/maven/shared/artifact/filter/PatternFilterPerfTest.java
index 7ee0013..8b5f26a 100644
--- a/src/test/java/org/apache/maven/shared/artifact/filter/PatternFilterPerfTest.java
+++ b/src/test/java/org/apache/maven/shared/artifact/filter/PatternFilterPerfTest.java
@@ -43,7 +43,7 @@ import org.openjdk.jmh.runner.options.TimeValue;
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Warmup(iterations = 3, time = 3, timeUnit = TimeUnit.SECONDS)
+@Warmup(iterations = 3, time = 3 )
public class PatternFilterPerfTest {
@State(Scope.Benchmark)
diff --git a/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeFilterTransformerTest.java b/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeFilterTransformerTest.java
index 4225088..1cef9a7 100644
--- a/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeFilterTransformerTest.java
+++ b/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeFilterTransformerTest.java
@@ -41,7 +41,6 @@ import org.apache.maven.shared.artifact.filter.resolve.OrFilter;
import org.apache.maven.shared.artifact.filter.resolve.PatternExclusionsFilter;
import org.apache.maven.shared.artifact.filter.resolve.PatternInclusionsFilter;
import org.apache.maven.shared.artifact.filter.resolve.ScopeFilter;
-import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
import org.junit.Before;
import org.junit.Test;
@@ -95,9 +94,9 @@ public class ArtifactIncludeFilterTransformerTest
public void testTransformOrFilter()
throws Exception
{
- OrFilter filter =
- new OrFilter( Arrays.<TransformableFilter>asList( ScopeFilter.including( "compile" ),
- ScopeFilter.including( "test" ) ) );
+ OrFilter filter = new OrFilter( Arrays.asList(
+ ScopeFilter.including( "compile" ),
+ ScopeFilter.including( "test" ) ) );
ArtifactFilter dependencyFilter = filter.transform( transformer );