Remove more unneeded Collectors usages

Author: ascopes

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/JctCompilationAssert.java

@@ -16,7 +16,6 @@
 package io.github.ascopes.jct.assertions;
 
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toUnmodifiableList;
 
 import io.github.ascopes.jct.compilers.JctCompilation;
 import io.github.ascopes.jct.containers.ContainerGroup;
@@ -351,7 +350,7 @@ private AssertionError failWithDiagnostics(
         .getDiagnostics()
         .stream()
         .filter(diagnostic -> kindsToDisplay.contains(diagnostic.getKind()))
-        .collect(toUnmodifiableList());
+        .toList();
 
     return failure(
         "%s\n\nDiagnostics:\n%s",

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/TraceDiagnosticListAssert.java

@@ -294,7 +294,7 @@ public TraceDiagnosticListAssert hasNoDiagnosticsOfKinds(Iterable<Kind> kinds) {
     var actualDiagnostics = actual
         .stream()
         .filter(kindIsOneOf(kinds))
-        .collect(toUnmodifiableList());
+        .toList();
 
     if (actualDiagnostics.isEmpty()) {
       return myself;

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/TypeAwareListAssert.java

@@ -15,11 +15,7 @@
  */
 package io.github.ascopes.jct.assertions;
 
-import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.toList;
-
 import java.util.List;
-import java.util.function.Function;
 import java.util.stream.StreamSupport;
 import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.AbstractListAssert;
@@ -60,12 +56,10 @@ protected A toAssert(@Nullable E value, String description) {
   protected TypeAwareListAssert<@Nullable E, A> newAbstractIterableAssert(
       Iterable<? extends @Nullable E> iterable
   ) {
-    return StreamSupport
+    var list = StreamSupport
         .stream(iterable.spliterator(), false)
-        .collect(collectingAndThen(toList(), curry()));
-  }
+        .toList();
 
-  private Function<@Nullable List<@Nullable E>, TypeAwareListAssert<@Nullable E, A>> curry() {
-    return list -> new TypeAwareListAssert<>(list, assertFactory);
+    return new TypeAwareListAssert<>(list, assertFactory);
   }
 }

java-compiler-testing/src/main/java/io/github/ascopes/jct/containers/impl/PathWrappingContainerImpl.java

@@ -31,7 +31,6 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Set;
-import java.util.stream.Collectors;
 import javax.tools.JavaFileManager.Location;
 import javax.tools.JavaFileObject;
 import javax.tools.JavaFileObject.Kind;
@@ -160,7 +159,7 @@ public String inferBinaryName(PathFileObject javaFileObject) {
   @Override
   public Collection<Path> listAllFiles() throws IOException {
     try (var walker = Files.walk(root.getPath(), FileVisitOption.FOLLOW_LINKS)) {
-      return walker.collect(Collectors.toUnmodifiableList());
+      return walker.toList();
     }
   }
 

java-compiler-testing/src/main/java/io/github/ascopes/jct/utils/FileUtils.java

@@ -16,7 +16,6 @@
 package io.github.ascopes.jct.utils;
 
 import static io.github.ascopes.jct.utils.IterableUtils.requireAtLeastOne;
-import static java.util.stream.Collectors.toUnmodifiableList;
 
 import io.github.ascopes.jct.ex.JctIllegalInputException;
 import java.net.MalformedURLException;
@@ -47,7 +46,7 @@ public final class FileUtils extends UtilityClass {
   private static final List<Kind> KINDS = Stream
       .of(Kind.values())
       .filter(kind -> !kind.extension.isEmpty())
-      .collect(toUnmodifiableList());
+      .toList();
 
   private static final StringSlicer PACKAGE_SLICER = new StringSlicer(".");
   private static final StringSlicer RESOURCE_SLICER = new StringSlicer("/");
@@ -254,7 +253,7 @@ public static Path resourceNameToPath(Path directory, String packageName, String
   /**
    * Convert a relative class path resource path to a NIO path.
    *
-   * @param directory the directory the resource sits within.
+   * @param directory     the directory the resource sits within.
    * @param pathFragments the path fragments to put together.
    * @return the path to the resource on the file system.
    */

java-compiler-testing/src/main/java/io/github/ascopes/jct/utils/SpecialLocationUtils.java

@@ -22,7 +22,6 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -116,7 +115,7 @@ private static List<Path> createPaths(String raw) {
         // src/main/java do not exist.
         .distinct()
         .filter(Files::exists)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   private static boolean isNotBlank(String string) {