From 41e869744598547f2cf951fe50df7168d9b8669b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 29 Jul 2022 10:00:54 +0200 Subject: [PATCH] Polish --- .../maven/AbstractDependencyFilterMojo.java | 28 +++++++++---------- .../boot/maven/AbstractPackagerMojo.java | 2 +- .../boot/maven/AbstractRunMojo.java | 5 ++-- .../boot/maven/DependencyFilterMojoTests.java | 4 +-- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java index cc0929ba64..cdec21f601 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java @@ -90,7 +90,7 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo { } protected List getDependencyURLs(ArtifactsFilter... additionalFilters) throws MojoExecutionException { - Set artifacts = filterDependencies(this.project.getArtifacts(), getFilters(additionalFilters)); + Set artifacts = filterDependencies(this.project.getArtifacts(), additionalFilters); List urls = new ArrayList<>(); for (Artifact artifact : artifacts) { if (artifact.getFile() != null) { @@ -100,6 +100,18 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo { return urls; } + protected final Set filterDependencies(Set dependencies, ArtifactsFilter... additionalFilters) + throws MojoExecutionException { + try { + Set filtered = new LinkedHashSet<>(dependencies); + filtered.retainAll(getFilters(additionalFilters).filter(dependencies)); + return filtered; + } + catch (ArtifactFilterException ex) { + throw new MojoExecutionException(ex.getMessage(), ex); + } + } + protected URL toURL(File file) { try { return file.toURI().toURL(); @@ -109,24 +121,12 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo { } } - protected final Set filterDependencies(Set dependencies, FilterArtifacts filters) - throws MojoExecutionException { - try { - Set filtered = new LinkedHashSet<>(dependencies); - filtered.retainAll(filters.filter(dependencies)); - return filtered; - } - catch (ArtifactFilterException ex) { - throw new MojoExecutionException(ex.getMessage(), ex); - } - } - /** * Return artifact filters configured for this MOJO. * @param additionalFilters optional additional filters to apply * @return the filters */ - protected final FilterArtifacts getFilters(ArtifactsFilter... additionalFilters) { + private FilterArtifacts getFilters(ArtifactsFilter... additionalFilters) { FilterArtifacts filters = new FilterArtifacts(); for (ArtifactsFilter additionalFilter : additionalFilters) { filters.addFilter(additionalFilter); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractPackagerMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractPackagerMojo.java index 82ff6455e4..560b53cee9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractPackagerMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractPackagerMojo.java @@ -184,7 +184,7 @@ public abstract class AbstractPackagerMojo extends AbstractDependencyFilterMojo */ protected final Libraries getLibraries(Collection unpacks) throws MojoExecutionException { Set artifacts = this.project.getArtifacts(); - Set includedArtifacts = filterDependencies(artifacts, getFilters(getAdditionalFilters())); + Set includedArtifacts = filterDependencies(artifacts, getAdditionalFilters()); return new ArtifactsLibraries(artifacts, includedArtifacts, this.session.getProjects(), unpacks, getLog()); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java index 4d5fe39e88..d7565a23d0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java @@ -36,7 +36,6 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts; import org.apache.maven.toolchain.ToolchainManager; import org.springframework.boot.loader.tools.FileUtils; @@ -371,8 +370,8 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { } private void addDependencies(List urls) throws MalformedURLException, MojoExecutionException { - FilterArtifacts filters = (this.useTestClasspath ? getFilters() : getFilters(new TestArtifactFilter())); - Set artifacts = filterDependencies(this.project.getArtifacts(), filters); + Set artifacts = (this.useTestClasspath) ? filterDependencies(this.project.getArtifacts()) + : filterDependencies(this.project.getArtifacts(), new TestArtifactFilter()); for (Artifact artifact : artifacts) { if (artifact.getFile() != null) { urls.add(artifact.getFile().toURI().toURL()); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java index d32b34e1c8..39aa828ea2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -165,7 +165,7 @@ class DependencyFilterMojoTests { Set filterDependencies(Artifact... artifacts) throws MojoExecutionException { Set input = new LinkedHashSet<>(Arrays.asList(artifacts)); - return filterDependencies(input, getFilters(this.additionalFilters)); + return filterDependencies(input, this.additionalFilters); } @Override