This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MSHARED-1002 in repository https://gitbox.apache.org/repos/asf/maven-common-artifact-filters.git
commit a95983dafb0765b169af98c8c8e4fe96857b717d Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Wed Dec 1 04:21:54 2021 +0100 [MSHARED-1002] Require Java 8 --- pom.xml | 46 +++++++++--- .../filter/PatternIncludesArtifactFilter.java | 7 +- .../artifact/filter/ScopeArtifactFilter.java | 2 +- .../ArtifactIncludeFilterTransformer.java | 84 +++++++++------------- .../transform/EclipseAetherFilterTransformer.java | 32 +++------ .../filter/AbstractPatternArtifactFilterTest.java | 2 +- .../artifact/filter/PatternFilterPerfTest.java | 2 +- .../ArtifactIncludeFilterTransformerTest.java | 2 +- .../EclipseAetherFilterTransformerTest.java | 2 +- 9 files changed, 85 insertions(+), 94 deletions(-) diff --git a/pom.xml b/pom.xml index 009fce2..35372ea 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ <properties> <maven.version>3.1.1</maven.version> - <javaVersion>7</javaVersion> + <javaVersion>8</javaVersion> <resolver.version>1.6.3</resolver.version> <surefire.version>2.22.2</surefire.version> <checkstyle.violation.ignore>MethodLength</checkstyle.violation.ignore> @@ -73,22 +73,46 @@ <version>3.0.0</version> </plugin> <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0-M3</version> - </plugin> - <plugin> <artifactId>maven-site-plugin</artifactId> <version>3.9.1</version> </plugin> <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>3.1.1</version> + <version>3.2.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>3.2.0</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0</version> + <dependencies> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>extra-enforcer-rules</artifactId> + <version>1.4</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>3.1.1</version> + <dependencies> + <dependency> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <version>9.2</version> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-shared-resources</artifactId> + <version>4</version> + </dependency> + </dependencies> + </plugin> </plugins> </pluginManagement> </build> @@ -127,7 +151,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.6</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> @@ -145,7 +169,7 @@ <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-utils</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </dependency> <dependency> @@ -157,7 +181,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.28.2</version> + <version>4.0.0</version> <scope>test</scope> </dependency> <dependency> @@ -175,13 +199,13 @@ <dependency> <groupId>org.openjdk.jmh</groupId> <artifactId>jmh-core</artifactId> - <version>1.27</version> + <version>1.32</version> <scope>test</scope> </dependency> <dependency> <groupId>org.openjdk.jmh</groupId> <artifactId>jmh-generator-annprocess</artifactId> - <version>1.27</version> + <version>1.32</version> <scope>test</scope> </dependency> </dependencies> diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java index 02e4d1b..b6f330e 100644 --- a/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java +++ b/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java @@ -117,12 +117,7 @@ public class PatternIncludesArtifactFilter { simplePat = new HashMap<>(); } - Map<String, Pattern> peqm = simplePat.get( nb ); - if ( peqm == null ) - { - peqm = new HashMap<>(); - simplePat.put( nb, peqm ); - } + Map<String, Pattern> peqm = simplePat.computeIfAbsent( nb, k -> new HashMap<>() ); peqm.put( peq, p ); it.remove(); } 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..9605ebf 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 @@ -232,7 +232,7 @@ public class ScopeArtifactFilter if ( report ) { - logger.debug( "The following scope filters were not used: " + buffer.toString() ); + logger.debug( "The following scope filters were not used: " + buffer ); } } } 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 12a42d7..0493c56 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 @@ -19,10 +19,6 @@ package org.apache.maven.shared.artifact.filter.resolve.transform; * under the License. */ -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; @@ -38,6 +34,9 @@ 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 java.util.ArrayList; +import java.util.Collection; + /** * Makes it possible to use the TransformableFilters for Aether and as classic Maven ArtifactFilter. * @@ -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; - - if ( scopeFilter.getIncluded() != null ) - { - isIncluded = scopeFilter.getIncluded().contains( artifact.getScope() ); - } - else - { - isIncluded = true; - } - - boolean isExcluded; + return includeNullScope; + } - if ( scopeFilter.getExcluded() != null ) - { - isExcluded = scopeFilter.getExcluded().contains( artifact.getScope() ); - } - else - { - isExcluded = false; - } + boolean isIncluded; + + if ( scopeFilter.getIncluded() != null ) + { + isIncluded = scopeFilter.getIncluded().contains( artifact.getScope() ); + } + else + { + isIncluded = true; + } - return isIncluded && !isExcluded; + boolean 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 238a53f..93a4c9c 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 @@ -35,7 +35,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; @@ -126,14 +125,7 @@ public class EclipseAetherFilterTransformer @Override public DependencyFilter transform( final AbstractFilter filter ) { - return new DependencyFilter() - { - @Override - public boolean accept( DependencyNode node, List<DependencyNode> parents ) - { - return filter.accept( new EclipseAetherNode( node ), null ); - } - }; + return ( node, parents ) -> filter.accept( new EclipseAetherNode( node ), null ); } private DependencyFilter newAdvancedPatternInclusionFilter( Collection<String> includes ) @@ -151,21 +143,17 @@ public class EclipseAetherFilterTransformer final String classifier = matcher.group( 2 ); - DependencyFilter classifierFilter = new DependencyFilter() + DependencyFilter classifierFilter = ( node, parents ) -> { - @Override - public boolean accept( DependencyNode node, List<DependencyNode> parents ) + String nodeClassifier = node.getArtifact().getClassifier(); + + if ( nodeClassifier == null ) + { + return false; + } + else { - String nodeClassifier = node.getArtifact().getClassifier(); - - if ( nodeClassifier == null ) - { - return false; - } - else - { - return "*".equals( classifier ) || nodeClassifier.matches( classifier ); - } + return "*".equals( classifier ) || nodeClassifier.matches( classifier ); } }; 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 cb4ad8d..cfd02ee 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 6cbe7a5..de74e63 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..017f4b3 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 @@ -96,7 +96,7 @@ public class ArtifactIncludeFilterTransformerTest throws Exception { OrFilter filter = - new OrFilter( Arrays.<TransformableFilter>asList( ScopeFilter.including( "compile" ), + new OrFilter( Arrays.asList( ScopeFilter.including( "compile" ), ScopeFilter.including( "test" ) ) ); ArtifactFilter dependencyFilter = filter.transform( transformer ); diff --git a/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java b/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java index 0955c71..792abe4 100644 --- a/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java +++ b/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java @@ -86,7 +86,7 @@ public class EclipseAetherFilterTransformerTest @Test public void testTransformOrFilter() { - OrFilter filter = new OrFilter( Arrays.<TransformableFilter>asList( ScopeFilter.including( "compile" ), + OrFilter filter = new OrFilter( Arrays.asList( ScopeFilter.including( "compile" ), ScopeFilter.including( "test" ) ) ); OrDependencyFilter dependencyFilter = (OrDependencyFilter) filter.transform( transformer );
