Merge branch '3.2.x'

Closes gh-41077

buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java

@@ -71,8 +71,7 @@ public class ToolchainPlugin implements Plugin<Project> {
 	}
 
 	private void configureTestToolchain(Project project, ToolchainExtension toolchain) {
-		List<String> jvmArgs = new ArrayList<>();
+		List<String> jvmArgs = new ArrayList<>(toolchain.getTestJvmArgs().getOrElse(Collections.emptyList()));
-		jvmArgs.addAll(toolchain.getTestJvmArgs().getOrElse(Collections.emptyList()));
 		project.getTasks().withType(Test.class, (test) -> test.jvmArgs(jvmArgs));
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/NativeImageResourceProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,8 +96,7 @@ class NativeImageResourceProvider implements ResourceProvider {
 		ensureInitialized();
 		Predicate<LocatedResource> matchesPrefixAndSuffixes = (locatedResource) -> StringUtils
 			.startsAndEndsWith(locatedResource.resource.getFilename(), prefix, suffixes);
-		List<LoadableResource> result = new ArrayList<>();
+		List<LoadableResource> result = new ArrayList<>(this.scanner.getResources(prefix, suffixes));
-		result.addAll(this.scanner.getResources(prefix, suffixes));
 		this.locatedResources.stream()
 			.filter(matchesPrefixAndSuffixes)
 			.map(this::asClassPathResource)

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/testing/testcontainers/vanilla/MyIntegrationTests.kt

@@ -32,8 +32,10 @@ class MyIntegrationTests {
 	}
 
 	companion object {
+
 		@Container
 		val neo4j = Neo4jContainer("neo4j:5")
+
 	}
 
 }

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/testcontainers/serviceconnections/MyIntegrationTests.kt

@@ -34,9 +34,12 @@ class MyIntegrationTests {
 	}
 
 	companion object {
+
 		@Container
 		@ServiceConnection
 		@JvmStatic
 		val neo4j = Neo4jContainer("neo4j:5");
+
 	}
+
 }

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java

@@ -240,8 +240,7 @@ class ImportsContextCustomizer implements ContextCustomizer {
 				this.key = Collections.unmodifiableSet(synthesize(annotations));
 			}
 			else {
-				Set<Object> key = new HashSet<>();
+				Set<Object> key = new HashSet<>(determinedImports);
-				key.addAll(determinedImports);
 				Set<Annotation> componentScanning = annotations.stream()
 					.filter((annotation) -> annotation.getType().equals(ComponentScan.class))
 					.map(MergedAnnotation::synthesize)

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,8 +68,8 @@ class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitio
 
 	private Set<ServiceConnection> getAnnotations(ConfigurableListableBeanFactory beanFactory, String beanName,
 			BeanDefinition beanDefinition) {
-		Set<ServiceConnection> annotations = new LinkedHashSet<>();
+		Set<ServiceConnection> annotations = new LinkedHashSet<>(
-		annotations.addAll(beanFactory.findAllAnnotationsOnBean(beanName, ServiceConnection.class, false));
+				beanFactory.findAllAnnotationsOnBean(beanName, ServiceConnection.class, false));
 		if (beanDefinition instanceof TestcontainerBeanDefinition testcontainerBeanDefinition) {
 			testcontainerBeanDefinition.getAnnotations()
 				.stream(ServiceConnection.class)

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigData.java

@@ -239,8 +239,7 @@ public final class ConfigData {
 		}
 
 		private Options copy(Consumer<EnumSet<Option>> processor) {
-			EnumSet<Option> options = EnumSet.noneOf(Option.class);
+			EnumSet<Option> options = EnumSet.copyOf(this.options);
-			options.addAll(this.options);
 			processor.accept(options);
 			return new Options(options);
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -195,8 +195,7 @@ final class TldPatterns {
 	static final Set<String> DEFAULT_SCAN;
 
 	static {
-		Set<String> scanPatterns = new LinkedHashSet<>();
+		Set<String> scanPatterns = new LinkedHashSet<>(TOMCAT_SCAN);
-		scanPatterns.addAll(TOMCAT_SCAN);
 		DEFAULT_SCAN = Collections.unmodifiableSet(scanPatterns);
 	}
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -128,8 +128,7 @@ class TomcatEmbeddedContext extends StandardContext {
 
 	@Override
 	public String[] findMimeMappings() {
-		List<String> mappings = new ArrayList<>();
+		List<String> mappings = new ArrayList<>(Arrays.asList(super.findMimeMappings()));
-		mappings.addAll(Arrays.asList(super.findMimeMappings()));
 		if (this.mimeMappings != null) {
 			this.mimeMappings.forEach((mapping) -> mappings.add(mapping.getExtension()));
 		}