Merge branch '3.4.x' into 3.5.x

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarReactiveAutoConfiguration.java

@@ -73,12 +73,9 @@
 @Import(PulsarConfiguration.class)
 public class PulsarReactiveAutoConfiguration {
 
-	private final PulsarProperties properties;
-
 	private final PulsarReactivePropertiesMapper propertiesMapper;
 
 	PulsarReactiveAutoConfiguration(PulsarProperties properties) {
-		this.properties = properties;
 		this.propertiesMapper = new PulsarReactivePropertiesMapper(properties);
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/EmbeddedWebServerFactoryCustomizerAutoConfiguration.java

@@ -91,9 +91,8 @@ public JettyWebServerFactoryCustomizer jettyWebServerFactoryCustomizer(Environme
 
 		@Bean
 		@ConditionalOnThreading(Threading.VIRTUAL)
-		JettyVirtualThreadsWebServerFactoryCustomizer jettyVirtualThreadsWebServerFactoryCustomizer(
-				ServerProperties serverProperties) {
-			return new JettyVirtualThreadsWebServerFactoryCustomizer(serverProperties);
+		JettyVirtualThreadsWebServerFactoryCustomizer jettyVirtualThreadsWebServerFactoryCustomizer() {
+			return new JettyVirtualThreadsWebServerFactoryCustomizer();
 		}
 
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/JettyVirtualThreadsWebServerFactoryCustomizer.java

@@ -35,10 +35,18 @@
 public class JettyVirtualThreadsWebServerFactoryCustomizer
 		implements WebServerFactoryCustomizer<ConfigurableJettyWebServerFactory>, Ordered {
 
-	private final ServerProperties serverProperties;
+	public JettyVirtualThreadsWebServerFactoryCustomizer() {
 
+	}
+
+	/**
+	 * Create a new JettyVirtualThreadsWebServerFactoryCustomizer.
+	 * @param serverProperties server properties
+	 * @deprecated since 3.4.12 for removal in 4.0.0 in favor of
+	 * {@link JettyVirtualThreadsWebServerFactoryCustomizer}.
+	 */
+	@Deprecated(since = "3.4.12", forRemoval = true)
 	public JettyVirtualThreadsWebServerFactoryCustomizer(ServerProperties serverProperties) {
-		this.serverProperties = serverProperties;
 	}
 
 	@Override

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/JettyVirtualThreadsWebServerFactoryCustomizerTests.java

@@ -21,7 +21,6 @@
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
 
-import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.web.embedded.jetty.ConfigurableJettyWebServerFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -39,9 +38,7 @@ class JettyVirtualThreadsWebServerFactoryCustomizerTests {
 	@Test
 	@EnabledForJreRange(min = JRE.JAVA_21)
 	void shouldConfigureVirtualThreads() {
-		ServerProperties properties = new ServerProperties();
-		JettyVirtualThreadsWebServerFactoryCustomizer customizer = new JettyVirtualThreadsWebServerFactoryCustomizer(
-				properties);
+		JettyVirtualThreadsWebServerFactoryCustomizer customizer = new JettyVirtualThreadsWebServerFactoryCustomizer();
 		ConfigurableJettyWebServerFactory factory = mock(ConfigurableJettyWebServerFactory.class);
 		customizer.customize(factory);
 		then(factory).should().setThreadPool(assertArg((threadPool) -> {

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

@@ -67,6 +67,7 @@
 import org.springframework.util.Assert;
 import org.springframework.util.StreamUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.util.function.ThrowingSupplier;
 
 /**
  * A {@link CopyAction} for creating a Spring Boot zip archive (typically a jar or war).
@@ -349,7 +350,7 @@ private void writeJarToolsIfNecessary() throws IOException {
 		private void writeJarModeLibrary(String location, JarModeLibrary library) throws IOException {
 			String name = location + library.getName();
 			writeEntry(name, ZipEntryContentWriter.fromInputStream(library.openStream()), false,
-					(entry) -> prepareStoredEntry(library.openStream(), false, entry));
+					(entry) -> prepareStoredEntry(library::openStream, false, entry));
 			if (BootZipCopyAction.this.layerResolver != null) {
 				Layer layer = BootZipCopyAction.this.layerResolver.getLayer(library);
 				this.layerIndex.add(layer, name);
@@ -447,12 +448,12 @@ private void prepareEntry(ZipArchiveEntry entry, String name, Long time, int mod
 		}
 
 		private void prepareStoredEntry(FileCopyDetails details, ZipArchiveEntry archiveEntry) throws IOException {
-			prepareStoredEntry(details.open(), BootZipCopyAction.this.requiresUnpack.isSatisfiedBy(details),
+			prepareStoredEntry(details::open, BootZipCopyAction.this.requiresUnpack.isSatisfiedBy(details),
 					archiveEntry);
 		}
 
-		private void prepareStoredEntry(InputStream input, boolean unpack, ZipArchiveEntry archiveEntry)
-				throws IOException {
+		private void prepareStoredEntry(ThrowingSupplier<InputStream> input, boolean unpack,
+				ZipArchiveEntry archiveEntry) throws IOException {
 			new StoredEntryPreparator(input, unpack).prepareStoredEntry(archiveEntry);
 		}
 
@@ -578,10 +579,10 @@ private static class StoredEntryPreparator {
 
 		private long size;
 
-		StoredEntryPreparator(InputStream inputStream, boolean unpack) throws IOException {
+		StoredEntryPreparator(ThrowingSupplier<InputStream> input, boolean unpack) throws IOException {
 			this.messageDigest = (unpack) ? sha1Digest() : null;
-			try (inputStream) {
-				load(inputStream);
+			try (InputStream stream = input.get()) {
+				load(stream);
 			}
 		}