Replace CollectionUtils.toUnmodifiableList() with Stream.toList()

Author: marcphilipp

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExclusiveResourceCollector.java

@@ -12,7 +12,6 @@
 
 import static org.junit.jupiter.api.parallel.ResourceLockTarget.SELF;
 import static org.junit.platform.commons.support.AnnotationSupport.findRepeatableAnnotations;
-import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList;
 
 import java.lang.reflect.AnnotatedElement;
 import java.util.Collection;
@@ -105,12 +104,16 @@ Stream<ExclusiveResource> getDynamicResources(
 		private List<ResourceLocksProvider> getProviders() {
 			if (this.providers == null) {
 				this.providers = annotations.stream() //
-						.flatMap(annotation -> Stream.of(annotation.providers()).map(ReflectionUtils::newInstance)) //
-						.collect(toUnmodifiableList());
+						.flatMap(annotation -> instantiate(annotation.providers())) //
+						.toList();
 			}
 			return providers;
 		}
 
+		private static Stream<ResourceLocksProvider> instantiate(Class<? extends ResourceLocksProvider>[] providers) {
+			return Stream.of(providers).map(ReflectionUtils::newInstance);
+		}
+
 		private static ExclusiveResource.LockMode toLockMode(ResourceAccessMode mode) {
 			return switch (mode) {
 				case READ -> ExclusiveResource.LockMode.READ;

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java

@@ -13,7 +13,6 @@
 import static org.junit.jupiter.engine.support.MethodReflectionUtils.getReturnType;
 import static org.junit.platform.commons.support.AnnotationSupport.findAnnotatedMethods;
 import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation;
-import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList;
 import static org.junit.platform.engine.support.discovery.DiscoveryIssueReporter.Condition.alwaysSatisfied;
 
 import java.lang.annotation.Annotation;
@@ -134,7 +133,7 @@ private static List<Method> findMethodsAndCheckVoidReturnType(Class<?> testClass
 				.peek(isNotPrivateWarning(issueReporter, annotationType::getSimpleName).toConsumer()) //
 				.filter(returnsPrimitiveVoid(issueReporter, __ -> annotationType.getSimpleName()).and(
 					additionalCondition).toPredicate()) //
-				.collect(toUnmodifiableList());
+				.toList();
 	}
 
 	private static Condition<Method> isStatic(DiscoveryIssueReporter issueReporter,

junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedClassContext.java

@@ -18,7 +18,6 @@
 import static org.junit.platform.commons.support.HierarchyTraversalMode.BOTTOM_UP;
 import static org.junit.platform.commons.support.HierarchyTraversalMode.TOP_DOWN;
 import static org.junit.platform.commons.support.ReflectionSupport.findFields;
-import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList;
 import static org.junit.platform.commons.util.ReflectionUtils.isRecordClass;
 
 import java.lang.annotation.Annotation;
@@ -161,7 +160,7 @@ private static <A extends Annotation> List<ArgumentSetLifecycleMethod> findLifec
 					}
 					return new ArgumentSetLifecycleMethod(method);
 				}) //
-				.collect(toUnmodifiableList());
+				.toList();
 	}
 
 	private static <A extends Annotation> A getAnnotation(Method method, Class<A> annotationType) {

junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java

@@ -13,7 +13,6 @@
 import static java.util.Arrays.asList;
 import static java.util.Objects.requireNonNull;
 import static org.apiguardian.api.API.Status.INTERNAL;
-import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList;
 import static org.junit.platform.commons.util.ReflectionUtils.isInnerClass;
 
 import java.lang.annotation.Annotation;
@@ -454,7 +453,7 @@ public static List<Field> findPublicAnnotatedFields(Class<?> clazz, Class<?> fie
 		// @formatter:off
 		return Arrays.stream(clazz.getFields())
 				.filter(field -> fieldType.isAssignableFrom(field.getType()) && isAnnotated(field, annotationType))
-				.collect(toUnmodifiableList());
+				.toList();
 		// @formatter:on
 	}
 

junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java

@@ -12,8 +12,6 @@
 
 import static java.util.Spliterator.ORDERED;
 import static java.util.Spliterators.spliteratorUnknownSize;
-import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.StreamSupport.stream;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.commons.support.ReflectionSupport.invokeMethod;
@@ -22,13 +20,11 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Optional;
 import java.util.function.Consumer;
-import java.util.stream.Collector;
 import java.util.stream.DoubleStream;
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
@@ -94,28 +90,6 @@ private CollectionUtils() {
 				: collection.iterator().next();
 	}
 
-	/**
-	 * Return a {@code Collector} that accumulates the input elements into a
-	 * new unmodifiable list, in encounter order.
-	 *
-	 * <p>There are no guarantees on the type or serializability of the list
-	 * returned, so if more control over the returned list is required,
-	 * consider creating a new {@code Collector} implementation like the
-	 * following:
-	 *
-	 * <pre class="code">
-	 * public static &lt;T&gt; Collector&lt;T, ?, List&lt;T&gt;&gt; toUnmodifiableList(Supplier&lt;List&lt;T&gt;&gt; listSupplier) {
-	 *     return Collectors.collectingAndThen(Collectors.toCollection(listSupplier), Collections::unmodifiableList);
-	 * }</pre>
-	 *
-	 * @param <T> the type of the input elements
-	 * @return a {@code Collector} which collects all the input elements into
-	 * an unmodifiable list, in encounter order
-	 */
-	public static <T extends @Nullable Object> Collector<T, ?, List<T>> toUnmodifiableList() {
-		return collectingAndThen(toList(), Collections::unmodifiableList);
-	}
-
 	/**
 	 * Determine if an instance of the supplied type can be converted into a
 	 * {@code Stream}.

junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java

@@ -16,7 +16,6 @@
 import static java.util.stream.Collectors.toSet;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.STABLE;
-import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList;
 import static org.junit.platform.commons.util.PackageNameUtils.getPackageName;
 import static org.junit.platform.commons.util.ReflectionUtils.HierarchyTraversalMode.BOTTOM_UP;
 import static org.junit.platform.commons.util.ReflectionUtils.HierarchyTraversalMode.TOP_DOWN;
@@ -707,7 +706,7 @@ public static List<Object> readFieldValues(List<Field> fields, @Nullable Object
 				.map(field ->
 					tryToReadFieldValue(field, instance)
 						.getOrThrow(ExceptionUtils::throwAsUncheckedException))
-				.collect(toUnmodifiableList());
+				.toList();
 		// @formatter:on
 	}
 
@@ -1314,7 +1313,7 @@ public static List<Constructor<?>> findConstructors(Class<?> clazz, Predicate<Co
 			// @formatter:off
 			return Arrays.stream(clazz.getDeclaredConstructors())
 					.filter(predicate)
-					.collect(toUnmodifiableList());
+					.toList();
 			// @formatter:on
 		}
 		catch (Throwable t) {
@@ -1328,7 +1327,7 @@ public static List<Constructor<?>> findConstructors(Class<?> clazz, Predicate<Co
 	public static List<Field> findFields(Class<?> clazz, Predicate<Field> predicate,
 			HierarchyTraversalMode traversalMode) {
 
-		return streamFields(clazz, predicate, traversalMode).collect(toUnmodifiableList());
+		return streamFields(clazz, predicate, traversalMode).toList();
 	}
 
 	/**
@@ -1594,7 +1593,7 @@ public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predica
 	public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predicate,
 			HierarchyTraversalMode traversalMode) {
 
-		return streamMethods(clazz, predicate, traversalMode).collect(toUnmodifiableList());
+		return streamMethods(clazz, predicate, traversalMode).toList();
 	}
 
 	/**

junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java

@@ -13,7 +13,6 @@
 import static java.util.stream.Collectors.toList;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
-import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList;
 
 import java.io.File;
 import java.io.IOException;
@@ -262,7 +261,7 @@ public static List<ClasspathRootSelector> selectClasspathRoots(Set<Path> classpa
 				.map(Path::toUri)
 				.map(ClasspathRootSelector::new)
 				// unmodifiable since selectClasspathRoots is a public, non-internal method
-				.collect(toUnmodifiableList());
+				.toList();
 		// @formatter:on
 	}
 
@@ -394,7 +393,7 @@ public static List<ModuleSelector> selectModules(Set<String> moduleNames) {
 		return moduleNames.stream()
 				.map(DiscoverySelectors::selectModule)
 				// unmodifiable since this is a public, non-internal method
-				.collect(toUnmodifiableList());
+				.toList();
 		// @formatter:on
 	}
 

junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java

@@ -15,7 +15,6 @@
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.STABLE;
-import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList;
 
 import java.util.Arrays;
 import java.util.List;
@@ -65,7 +64,7 @@ public class NestedClassSelector implements DiscoverySelector {
 		this.classLoader = classLoader;
 		this.enclosingClassSelectors = enclosingClassNames.stream() //
 				.map(className -> new ClassSelector(classLoader, className)) //
-				.collect(toUnmodifiableList());
+				.toList();
 		this.nestedClassSelector = new ClassSelector(classLoader, nestedClassName);
 	}
 

junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java

@@ -15,7 +15,6 @@
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toList;
 import static org.junit.platform.commons.util.CollectionUtils.getOnlyElement;
-import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList;
 import static org.junit.platform.engine.support.hierarchical.ExclusiveResource.GLOBAL_READ;
 import static org.junit.platform.engine.support.hierarchical.ExclusiveResource.GLOBAL_READ_WRITE;
 import static org.junit.platform.engine.support.hierarchical.ExclusiveResource.LockMode.READ;
@@ -66,7 +65,7 @@ private List<ExclusiveResource> toDistinctSortedResources(Collection<ExclusiveRe
 
 		return resourcesByKey.values().stream()
 				.map(resourcesWithSameKey -> resourcesWithSameKey.get(0))
-				.collect(toUnmodifiableList());
+				.toList();
 		// @formatter:on
 	}
 
@@ -89,7 +88,7 @@ private SingleLock toSingleLock(ExclusiveResource resource) {
 	}
 
 	private List<Lock> toLocks(List<ExclusiveResource> resources) {
-		return resources.stream().map(this::toLock).collect(toUnmodifiableList());
+		return resources.stream().map(this::toLock).toList();
 	}
 
 	private Lock toLock(ExclusiveResource resource) {

junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java

@@ -12,7 +12,6 @@
 
 import static java.util.Arrays.asList;
 import static org.apiguardian.api.API.Status.STABLE;
-import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList;
 
 import java.util.List;
 import java.util.Set;
@@ -173,7 +172,7 @@ private static String formatToString(List<String> tagExpressions) {
 	}
 
 	private static List<TagExpression> parseAll(List<String> tagExpressions) {
-		return tagExpressions.stream().map(TagFilter::parse).collect(toUnmodifiableList());
+		return tagExpressions.stream().map(TagFilter::parse).toList();
 	}
 
 	private static TagExpression parse(@Nullable String tagExpression) {