Merge branch '3.1.x'

Closes gh-36238

buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureCheck.java

@@ -70,15 +70,15 @@ public abstract class ArchitectureCheck extends DefaultTask {
 	@TaskAction
 	void checkArchitecture() throws IOException {
 		JavaClasses javaClasses = new ClassFileImporter()
-			.importPaths(this.classes.getFiles().stream().map(File::toPath).collect(Collectors.toList()));
+			.importPaths(this.classes.getFiles().stream().map(File::toPath).toList());
 		List<EvaluationResult> violations = Stream.of(allPackagesShouldBeFreeOfTangles(),
 				allBeanPostProcessorBeanMethodsShouldBeStaticAndHaveParametersThatWillNotCausePrematureInitialization(),
 				allBeanFactoryPostProcessorBeanMethodsShouldBeStaticAndHaveNoParameters(),
 				noClassesShouldCallStepVerifierStepVerifyComplete(),
-				noClassesShouldConfigureDefaultStepVerifierTimeout())
+				noClassesShouldConfigureDefaultStepVerifierTimeout(), noClassesShouldCallCollectorsToList())
 			.map((rule) -> rule.evaluate(javaClasses))
 			.filter(EvaluationResult::hasViolation)
-			.collect(Collectors.toList());
+			.toList();
 		File outputFile = getOutputDirectory().file("failure-report.txt").get().getAsFile();
 		outputFile.getParentFile().mkdirs();
 		if (!violations.isEmpty()) {
@@ -178,6 +178,13 @@ public abstract class ArchitectureCheck extends DefaultTask {
 			.because("expectComplete().verify(Duration) should be used instead");
 	}
 
+	private ArchRule noClassesShouldCallCollectorsToList() {
+		return ArchRuleDefinition.noClasses()
+			.should()
+			.callMethod(Collectors.class, "toList")
+			.because("java.util.stream.Stream.toList() should be used instead");
+	}
+
 	public void setClasses(FileCollection classes) {
 		this.classes = classes;
 	}

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java

@@ -103,7 +103,7 @@ class StandardLibraryUpdateResolver implements LibraryUpdateResolver {
 			.flatMap(SortedSet::stream)
 			.distinct()
 			.filter((dependencyVersion) -> isPermitted(dependencyVersion, library.getProhibitedVersions()))
-			.collect(Collectors.toList());
+			.toList();
 		if (allVersions.isEmpty()) {
 			return Collections.emptyList();
 		}

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/sonatype/ArtifactCollector.java

@@ -50,7 +50,7 @@ class ArtifactCollector {
 	Collection<DeployableArtifact> collectArtifacts(Path root) {
 		try (Stream<Path> artifacts = Files.walk(root)) {
 			return artifacts.filter(Files::isRegularFile).filter(this.excludeFilter)
-					.map((artifact) -> deployableArtifact(artifact, root)).collect(Collectors.toList());
+					.map((artifact) -> deployableArtifact(artifact, root)).toList();
 		}
 		catch (IOException ex) {
 			throw new RuntimeException("Could not read artifacts from '" + root + "'");

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/sonatype/SonatypeService.java

@@ -208,7 +208,7 @@ public class SonatypeService {
 			List<String> failureMessages = Stream.of(activities).flatMap((activity) -> activity.events.stream())
 					.filter((event) -> event.severity > 0).flatMap((event) -> event.properties.stream())
 					.filter((property) -> "failureMessage".equals(property.name))
-					.map((property) -> "    " + property.value).collect(Collectors.toList());
+					.map((property) -> "    " + property.value).toList();
 			if (failureMessages.isEmpty()) {
 				logger.error("Close failed for unknown reasons");
 			}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/flyway/FlywayEndpoint.java

@@ -21,7 +21,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.flywaydb.core.Flyway;
@@ -116,7 +115,7 @@ public class FlywayEndpoint {
 		private final List<FlywayMigrationDescriptor> migrations;
 
 		private FlywayDescriptor(MigrationInfo[] migrations) {
-			this.migrations = Stream.of(migrations).map(FlywayMigrationDescriptor::new).collect(Collectors.toList());
+			this.migrations = Stream.of(migrations).map(FlywayMigrationDescriptor::new).toList();
 		}
 
 		public FlywayDescriptor(List<FlywayMigrationDescriptor> migrations) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.autoconfigure.jms.activemq;
 
-import java.util.stream.Collectors;
-
 import jakarta.jms.ConnectionFactory;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.commons.pool2.PooledObject;
@@ -60,8 +58,7 @@ class ActiveMQConnectionFactoryConfiguration {
 
 		private static ActiveMQConnectionFactory createJmsConnectionFactory(ActiveMQProperties properties,
 				ObjectProvider<ActiveMQConnectionFactoryCustomizer> factoryCustomizers) {
-			return new ActiveMQConnectionFactoryFactory(properties,
+			return new ActiveMQConnectionFactoryFactory(properties, factoryCustomizers.orderedStream().toList())
-					factoryCustomizers.orderedStream().collect(Collectors.toList()))
 				.createConnectionFactory(ActiveMQConnectionFactory.class);
 		}
 
@@ -96,7 +93,7 @@ class ActiveMQConnectionFactoryConfiguration {
 		JmsPoolConnectionFactory jmsConnectionFactory(ActiveMQProperties properties,
 				ObjectProvider<ActiveMQConnectionFactoryCustomizer> factoryCustomizers) {
 			ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactoryFactory(properties,
-					factoryCustomizers.orderedStream().collect(Collectors.toList()))
+					factoryCustomizers.orderedStream().toList())
 				.createConnectionFactory(ActiveMQConnectionFactory.class);
 			return new JmsPoolConnectionFactoryFactory(properties.getPool())
 				.createPooledConnectionFactory(connectionFactory);

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.autoconfigure.jms.activemq;
 
-import java.util.stream.Collectors;
-
 import jakarta.jms.ConnectionFactory;
 import jakarta.transaction.TransactionManager;
 import org.apache.activemq.ActiveMQConnectionFactory;
@@ -51,7 +49,7 @@ class ActiveMQXAConnectionFactoryConfiguration {
 			ObjectProvider<ActiveMQConnectionFactoryCustomizer> factoryCustomizers, XAConnectionFactoryWrapper wrapper)
 			throws Exception {
 		ActiveMQXAConnectionFactory connectionFactory = new ActiveMQConnectionFactoryFactory(properties,
-				factoryCustomizers.orderedStream().collect(Collectors.toList()))
+				factoryCustomizers.orderedStream().toList())
 			.createConnectionFactory(ActiveMQXAConnectionFactory.class);
 		return wrapper.wrapConnectionFactory(connectionFactory);
 	}
@@ -61,8 +59,7 @@ class ActiveMQXAConnectionFactoryConfiguration {
 			matchIfMissing = true)
 	ActiveMQConnectionFactory nonXaJmsConnectionFactory(ActiveMQProperties properties,
 			ObjectProvider<ActiveMQConnectionFactoryCustomizer> factoryCustomizers) {
-		return new ActiveMQConnectionFactoryFactory(properties,
+		return new ActiveMQConnectionFactoryFactory(properties, factoryCustomizers.orderedStream().toList())
-				factoryCustomizers.orderedStream().collect(Collectors.toList()))
 			.createConnectionFactory(ActiveMQConnectionFactory.class);
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/java/org/springframework/boot/configurationmetadata/changelog/ChangelogTests.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.configurationmetadata.changelog;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Test;
 
@@ -43,13 +42,13 @@ class ChangelogTests {
 		List<Difference> added = differences.differences()
 			.stream()
 			.filter((difference) -> difference.type() == DifferenceType.ADDED)
-			.collect(Collectors.toList());
+			.toList();
 		assertThat(added).hasSize(1);
 		assertProperty(added.get(0).newProperty(), "test.add", String.class, "new");
 		List<Difference> deleted = differences.differences()
 			.stream()
 			.filter((difference) -> difference.type() == DifferenceType.DELETED)
-			.collect(Collectors.toList());
+			.toList();
 		assertThat(deleted).hasSize(2)
 			.anySatisfy((entry) -> assertProperty(entry.oldProperty(), "test.delete", String.class, "delete"))
 			.anySatisfy(
@@ -57,7 +56,7 @@ class ChangelogTests {
 		List<Difference> deprecated = differences.differences()
 			.stream()
 			.filter((difference) -> difference.type() == DifferenceType.DEPRECATED)
-			.collect(Collectors.toList());
+			.toList();
 		assertThat(deprecated).hasSize(1);
 		assertProperty(deprecated.get(0).oldProperty(), "test.deprecate", String.class, "wrong");
 		assertProperty(deprecated.get(0).newProperty(), "test.deprecate", String.class, "wrong");

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/ResolvedDependencies.java

@@ -84,10 +84,10 @@ class ResolvedDependencies {
 	}
 
 	void resolvedArtifacts(Provider<Set<ResolvedArtifactResult>> resolvedArtifacts) {
-		this.artifactFiles.addAll(resolvedArtifacts
+		this.artifactFiles.addAll(
-			.map((artifacts) -> artifacts.stream().map(ResolvedArtifactResult::getFile).collect(Collectors.toList())));
+				resolvedArtifacts.map((artifacts) -> artifacts.stream().map(ResolvedArtifactResult::getFile).toList()));
-		this.artifactIds.addAll(resolvedArtifacts
+		this.artifactIds.addAll(
-			.map((artifacts) -> artifacts.stream().map(ResolvedArtifactResult::getId).collect(Collectors.toList())));
+				resolvedArtifacts.map((artifacts) -> artifacts.stream().map(ResolvedArtifactResult::getId).toList()));
 	}
 
 	DependencyDescriptor find(File file) {

spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java

@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty;
 import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepository;
@@ -82,9 +81,7 @@ class PropertiesMigrationReporter {
 	private PropertySource<?> mapPropertiesWithReplacement(PropertiesMigrationReport report, String name,
 			List<PropertyMigration> properties) {
 		report.add(name, properties);
-		List<PropertyMigration> renamed = properties.stream()
+		List<PropertyMigration> renamed = properties.stream().filter(PropertyMigration::isCompatibleType).toList();
-			.filter(PropertyMigration::isCompatibleType)
-			.collect(Collectors.toList());
 		if (renamed.isEmpty()) {
 			return null;
 		}
@@ -118,10 +115,7 @@ class PropertiesMigrationReporter {
 	private Map<String, List<PropertyMigration>> getMatchingProperties(
 			Predicate<ConfigurationMetadataProperty> filter) {
 		MultiValueMap<String, PropertyMigration> result = new LinkedMultiValueMap<>();
-		List<ConfigurationMetadataProperty> candidates = this.allProperties.values()
+		List<ConfigurationMetadataProperty> candidates = this.allProperties.values().stream().filter(filter).toList();
-			.stream()
-			.filter(filter)
-			.collect(Collectors.toList());
 		getPropertySourcesAsMap().forEach((propertySourceName, propertySource) -> candidates.forEach((metadata) -> {
 			ConfigurationPropertyName metadataName = ConfigurationPropertyName.isValid(metadata.getId())
 					? ConfigurationPropertyName.of(metadata.getId())

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

@@ -34,7 +34,6 @@ import java.util.Set;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
@@ -107,7 +106,7 @@ final class ModifiedClassPathClassLoader extends URLClassLoader {
 		candidates.addAll(getAnnotatedElements(arguments.toArray()));
 		List<AnnotatedElement> annotatedElements = candidates.stream()
 			.filter(ModifiedClassPathClassLoader::hasAnnotation)
-			.collect(Collectors.toList());
+			.toList();
 		if (annotatedElements.isEmpty()) {
 			return null;
 		}