Use Java 17 language features for streams

ascopes · ascopes · commit 4271ed14ca59 · 2025-11-09T09:41:33.000Z
diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/dependencies/aether/AetherMavenArtifactPathResolver.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/dependencies/aether/AetherMavenArtifactPathResolver.java
@@ -30,7 +30,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -143,6 +142,6 @@ public List<Path> resolveDependencies(
         .map(aetherArtifactMapper::mapEclipseArtifactToPath)
         // Order matters here, so don't convert to an unordered container in the
         // future. We make assumptions on the order of this elsewhere.
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 }
diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/generation/ProtobufBuildOrchestrator.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/generation/ProtobufBuildOrchestrator.java
@@ -43,7 +43,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.TreeSet;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -226,7 +225,7 @@ private void createOutputDirectories(
                 .filter(Objects::nonNull)
         )
         .flatMap(identity())
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
 
     if (!incrementalCompilation && request.isCleanOutputDirectories()) {
       for (var outputDirectory : outputDirectories) {
@@ -376,12 +375,12 @@ private ProtocInvocation createProtocInvocation(
         .of(projectInputs.getCompilableProtoSources(), projectInputs.getDependencyProtoSources())
         .flatMap(Collection::stream)
         .map(SourceListing::getSourceRoot)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
 
     var inputDescriptorFiles = projectInputs.getCompilableDescriptorFiles()
         .stream()
         .map(DescriptorListing::getDescriptorFilePath)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
 
     return ImmutableProtocInvocation.builder()
         .arguments(request.getArguments())
diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/mojo/AbstractGenerateMojo.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/mojo/AbstractGenerateMojo.java
@@ -39,7 +39,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import javax.inject.Inject;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -1166,15 +1165,15 @@ private Collection<Path> determinePaths(
         .filter(not(Collection::isEmpty))
         .stream()
         .flatMap(Collection::stream)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
 
     var finalValue = transformed.isEmpty()
         ? defaultIfMissing.get()
         : transformed;
 
     return finalValue.stream()
         .filter(Files::exists)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   private <L> List<L> nonNullList(@Nullable List<L> list) {
diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/plugins/JvmPluginResolver.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/plugins/JvmPluginResolver.java
@@ -43,7 +43,6 @@
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.jar.Manifest;
-import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.apache.maven.execution.scope.MojoExecutionScoped;
@@ -173,7 +172,7 @@ private ArgumentFileBuilder buildArgLine(MavenProtocPlugin plugin) throws Resolu
             false
         )
         .stream()
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
 
     var args = new ArgumentFileBuilder();
 
@@ -301,7 +300,7 @@ private List<Path> findJavaModules(List<Path> paths) {
         .map(FileUtils::normalize)
         // Sort as the order of output is arbitrary, and this ensures reproducible builds.
         .sorted(Comparator.comparing(Path::toString))
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   private Predicate<String> checkValidJvmConfigArg(MavenProtocPlugin plugin) {
diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/DescriptorListing.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/DescriptorListing.java
@@ -18,7 +18,6 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Set;
-import java.util.stream.Collectors;
 import org.immutables.value.Value.Immutable;
 
 /**
@@ -37,6 +36,6 @@ static Collection<String> flatten(Collection<? extends DescriptorListing> listin
     return listings.stream()
         .map(DescriptorListing::getSourceFiles)
         .flatMap(Collection::stream)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 }
diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/ProjectInputResolver.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/ProjectInputResolver.java
@@ -23,7 +23,6 @@
 import io.github.ascopes.protobufmavenplugin.sources.filter.ProtoFileFilter;
 import io.github.ascopes.protobufmavenplugin.utils.ResolutionException;
 import java.util.Collection;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -100,7 +99,7 @@ private Collection<SourceListing> resolveCompilableProtoSources(
     return Stream
         .concat(sourcePathsListings.stream(), sourceDependencyListings.stream())
         .distinct()
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   private Collection<SourceListing> resolveDependencyProtoSources(
@@ -121,7 +120,7 @@ private Collection<SourceListing> resolveDependencyProtoSources(
     var importPaths = Stream
         .concat(request.getImportPaths().stream(), artifactPaths.stream())
         .distinct()
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
 
     return sourceResolver.resolveSources(importPaths, filter);
   }
@@ -144,7 +143,7 @@ private Collection<DescriptorListing> resolveCompilableDescriptorSources(
     var descriptorFilePaths = Stream
         .concat(request.getSourceDescriptorPaths().stream(), artifactPaths.stream())
         .distinct()
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
 
     return sourceResolver.resolveDescriptors(descriptorFilePaths, filter);
   }
diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/ProtoSourceResolver.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/ProtoSourceResolver.java
@@ -90,7 +90,7 @@ Collection<DescriptorListing> resolveDescriptors(
         .collect(concurrentExecutor.awaiting())
         .stream()
         .flatMap(Optional::stream)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   private Optional<DescriptorListing> resolveDescriptor(
@@ -150,7 +150,7 @@ Collection<SourceListing> resolveSources(
         .collect(concurrentExecutor.awaiting())
         .stream()
         .flatMap(Optional::stream)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   private Optional<SourceListing> resolveSources(
diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/SourceListing.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/SourceListing.java
@@ -18,7 +18,6 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Set;
-import java.util.stream.Collectors;
 import org.immutables.value.Value.Immutable;
 
 /**
@@ -37,6 +36,6 @@ static Collection<Path> flatten(Collection<? extends SourceListing> listings) {
     return listings.stream()
         .map(SourceListing::getSourceFiles)
         .flatMap(Collection::stream)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 }
diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/filter/IncludesExcludesGlobFilter.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/filter/IncludesExcludesGlobFilter.java
@@ -20,7 +20,6 @@
 import java.nio.file.PathMatcher;
 import java.util.List;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 /**
  * File filter that handles inclusion and exclusion glob lists.
@@ -56,7 +55,7 @@ private static List<PathMatcher> compile(List<String> globs) {
     return globs.stream()
         .map("glob:"::concat)
         .map(FileSystems.getDefault()::getPathMatcher)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   private static Predicate<PathMatcher> path(Path path) {
diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/urls/AbstractUrlStreamHandlerFactory.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/urls/AbstractUrlStreamHandlerFactory.java
@@ -21,7 +21,6 @@
 import java.net.URLStreamHandler;
 import java.net.URLStreamHandlerFactory;
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.jspecify.annotations.Nullable;
 
@@ -39,7 +38,7 @@ abstract class AbstractUrlStreamHandlerFactory implements URLStreamHandlerFactor
     // Two args to enforce at least one protocol at any time.
     this.protocols = Stream
         .concat(Stream.of(protocol), Stream.of(protocols))
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
     streamHandler = new UrlStreamHandlerImpl();
   }
 
diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/utils/HostSystem.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/utils/HostSystem.java
@@ -158,7 +158,7 @@ private static List<Path> parsePath(String rawPath, String pathSeparator) {
             .flatMap(HostSystem::tryParseSystemFilePath)
             .distinct()
             .filter(Files::isDirectory)
-            .collect(Collectors.toUnmodifiableList())
+            .toList()
     );
   }
 
diff --git a/protobuf-maven-plugin/src/test/java/io/github/ascopes/protobufmavenplugin/ProjectStructureTest.java b/protobuf-maven-plugin/src/test/java/io/github/ascopes/protobufmavenplugin/ProjectStructureTest.java
@@ -50,9 +50,7 @@ void eachPackageHasPackageInfo() throws IOException {
   private boolean hasChildFiles(Path baseDir) {
     try (var files = Files.walk(baseDir, 1)) {
       return files
-          .filter(Files::isRegularFile)
-          .findAny()
-          .isPresent();
+          .anyMatch(Files::isRegularFile);
     } catch (IOException ex) {
       throw new UncheckedIOException(ex);
     }
diff --git a/protobuf-maven-plugin/src/test/java/io/github/ascopes/protobufmavenplugin/plugins/ProjectPluginResolverTest.java b/protobuf-maven-plugin/src/test/java/io/github/ascopes/protobufmavenplugin/plugins/ProjectPluginResolverTest.java
@@ -26,7 +26,6 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -76,7 +75,7 @@ void resolveProjectPluginsDelegatesToTheInternalPluginResolvers() throws Excepti
             resolvedJvmMavenPlugins
         )
         .flatMap(Collection::stream)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
 
     var binaryMavenPlugins = List.<MavenProtocPlugin>of(mock(), mock(), mock());
     var binaryPathPlugins = List.<PathProtocPlugin>of(mock(), mock());

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`import java.nio.file.Path;`
`19`	`19`	`import java.util.Collection;`
`20`	`20`	`import java.util.Set;`
`21`		`-import java.util.stream.Collectors;`
`22`	`21`	`import org.immutables.value.Value.Immutable;`
`23`	`22`
`24`	`23`	`/**`
`@@ -37,6 +36,6 @@ static Collection<String> flatten(Collection<? extends DescriptorListing> listin`
`37`	`36`	`return listings.stream()`
`38`	`37`	`.map(DescriptorListing::getSourceFiles)`
`39`	`38`	`.flatMap(Collection::stream)`
`40`		`- .collect(Collectors.toUnmodifiableList());`
	`39`	`+ .toList();`
`41`	`40`	`}`
`42`	`41`	`}`