Use LazyFiles on testLib and Maven plugin

Author: simonlebras

lib/src/test/java/com/diffplug/spotless/JarStateTest.java

@@ -25,6 +25,7 @@
 import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.assertj.core.api.SoftAssertions;
@@ -42,7 +43,10 @@ class JarStateTest {
 
 	File b;
 
-	Provisioner provisioner = (withTransitives, deps) -> deps.stream().map(name -> name.equals("a") ? a : b).collect(Collectors.toSet());
+	Provisioner provisioner = (withTransitives, deps) -> {
+		Set<File> files = deps.stream().map(name -> name.equals("a") ? a : b).collect(Collectors.toSet());
+		return LazyFiles.of(files);
+	};
 
 	@BeforeEach
 	void setUp() throws IOException {

plugin-maven/src/main/java/com/diffplug/spotless/maven/ArtifactResolver.java

@@ -18,6 +18,8 @@
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
 
+import com.diffplug.spotless.LazyFiles;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -60,7 +62,7 @@ public ArtifactResolver(RepositorySystem repositorySystem, RepositorySystemSessi
 	 * Given a set of maven coordinates, returns a set of jars which include all
 	 * of the specified coordinates and optionally their transitive dependencies.
 	 */
-	public Set<File> resolve(boolean withTransitives, Collection<String> mavenCoordinates) {
+	public LazyFiles resolve(boolean withTransitives, Collection<String> mavenCoordinates) {
 		Collection<Exclusion> excludeTransitive = new ArrayList<>(1);
 		if (!withTransitives) {
 			excludeTransitive.add(EXCLUDE_ALL_TRANSITIVES);
@@ -73,12 +75,13 @@ public Set<File> resolve(boolean withTransitives, Collection<String> mavenCoordi
 		DependencyRequest dependencyRequest = new DependencyRequest(collectRequest, null);
 		DependencyResult dependencyResult = resolveDependencies(dependencyRequest);
 
-		return dependencyResult.getArtifactResults()
+		Set<File> jars = dependencyResult.getArtifactResults()
 				.stream()
 				.peek(this::logResolved)
 				.map(ArtifactResult::getArtifact)
 				.map(Artifact::getFile)
 				.collect(toSet());
+		return LazyFiles.of(jars);
 	}
 
 	private DependencyResult resolveDependencies(DependencyRequest dependencyRequest) {

testlib/src/test/java/com/diffplug/spotless/ProvisionerTest.java

@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.util.Arrays;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.assertj.core.api.Assertions;
@@ -25,12 +26,15 @@
 class ProvisionerTest {
 	@Test
 	void testManipulation() {
-		Provisioner provisioner = (withTransitives, deps) -> deps.stream().map(File::new).collect(Collectors.toSet());
-		Assertions.assertThat(provisioner.provisionWithTransitives(true, "a"))
+		Provisioner provisioner = (withTransitives, deps) -> {
+			Set<File> files = deps.stream().map(File::new).collect(Collectors.toSet());
+			return LazyFiles.of(files);
+		};
+		Assertions.assertThat(provisioner.provisionWithTransitives(true, "a").files())
 				.containsExactlyInAnyOrder(new File("a"));
-		Assertions.assertThat(provisioner.provisionWithTransitives(true, "a", "a"))
+		Assertions.assertThat(provisioner.provisionWithTransitives(true, "a", "a").files())
 				.containsExactlyInAnyOrder(new File("a"));
-		Assertions.assertThat(provisioner.provisionWithTransitives(true, Arrays.asList("a", "a")))
+		Assertions.assertThat(provisioner.provisionWithTransitives(true, Arrays.asList("a", "a")).files())
 				.containsExactlyInAnyOrder(new File("a"));
 	}
 }