Merge branch '3.2.x' into 3.3.x

Closes gh-42417

buildSrc/src/main/java/org/springframework/boot/build/bom/CheckLinks.java

@@ -64,8 +64,8 @@ void releaseNotes() {
  try {
  uri = new URI(link);
  ResponseEntity<String> response = restTemplate.exchange(uri, HttpMethod.HEAD, null, String.class);
- System.out.println("[%3d] %s - %s (%s)".formatted(response.getStatusCode().value(),
- library.getName(), name, uri));
+ System.out.printf("[%3d] %s - %s (%s)%n", response.getStatusCode().value(), library.getName(), name,
+ uri);
  }
  catch (URISyntaxException ex) {
  throw new RuntimeException(ex);

buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestPlugin.java

@@ -98,15 +98,14 @@ private SourceSet createSourceSet(Project project) {
 
  private Provider<Test> createTestTask(Project project, SourceSet dockerTestSourceSet,
  Provider<DockerTestBuildService> buildService) {
- Provider<Test> dockerTest = project.getTasks().register(DOCKER_TEST_TASK_NAME, Test.class, (task) -> {
+ return project.getTasks().register(DOCKER_TEST_TASK_NAME, Test.class, (task) -> {
  task.usesService(buildService);
  task.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP);
  task.setDescription("Runs Docker-based tests.");
  task.setTestClassesDirs(dockerTestSourceSet.getOutput().getClassesDirs());
  task.setClasspath(dockerTestSourceSet.getRuntimeClasspath());
  task.shouldRunAfter(JavaPlugin.TEST_TASK_NAME);
  });
- return dockerTest;
  }
 
 }

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntriesStream.java

@@ -54,9 +54,6 @@ class JarEntriesStream implements Closeable {
 
  JarEntry getNextEntry() throws IOException {
  this.entry = this.in.getNextJarEntry();
- if (this.entry != null) {
- this.entry.getSize();
- }
  this.inflater.reset();
  return this.entry;
  }

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection.java

@@ -211,9 +211,9 @@ public boolean getAllowUserInteraction() {
  }
 
  @Override
- public void setAllowUserInteraction(boolean allowuserinteraction) {
+ public void setAllowUserInteraction(boolean allowUserInteraction) {
  if (this.jarFileConnection != null) {
- this.jarFileConnection.setAllowUserInteraction(allowuserinteraction);
+ this.jarFileConnection.setAllowUserInteraction(allowUserInteraction);
  }
  }
 
@@ -223,9 +223,9 @@ public boolean getUseCaches() {
  }
 
  @Override
- public void setUseCaches(boolean usecaches) {
+ public void setUseCaches(boolean useCaches) {
  if (this.jarFileConnection != null) {
- this.jarFileConnection.setUseCaches(usecaches);
+ this.jarFileConnection.setUseCaches(useCaches);
  }
  }
 
@@ -235,9 +235,9 @@ public boolean getDefaultUseCaches() {
  }
 
  @Override
- public void setDefaultUseCaches(boolean defaultusecaches) {
+ public void setDefaultUseCaches(boolean defaultUseCaches) {
  if (this.jarFileConnection != null) {
- this.jarFileConnection.setDefaultUseCaches(defaultusecaches);
+ this.jarFileConnection.setDefaultUseCaches(defaultUseCaches);
  }
  }
 

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/LazyDelegatingInputStream.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.
@@ -64,9 +64,9 @@ public boolean markSupported() {
  }
 
  @Override
- public synchronized void mark(int readlimit) {
+ public synchronized void mark(int readLimit) {
  try {
- in().mark(readlimit);
+ in().mark(readLimit);
  }
  catch (IOException ex) {
  // Ignore

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/NestedFileSystem.java

@@ -98,11 +98,9 @@ private boolean hasFileSystem(URI uri) {
 
  private boolean isCreatingNewFileSystem() {
  StackTraceElement[] stack = Thread.currentThread().getStackTrace();
- if (stack != null) {
- for (StackTraceElement element : stack) {
- if (FILE_SYSTEMS_CLASS_NAME.equals(element.getClassName())) {
- return "newFileSystem".equals(element.getMethodName());
- }
+ for (StackTraceElement element : stack) {
+ if (FILE_SYSTEMS_CLASS_NAME.equals(element.getClassName())) {
+ return "newFileSystem".equals(element.getMethodName());
  }
  }
  return false;

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/NestedFileSystemProvider.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.
@@ -50,7 +50,7 @@
  */
 public class NestedFileSystemProvider extends FileSystemProvider {
 
- private Map<Path, NestedFileSystem> fileSystems = new HashMap<>();
+ private final Map<Path, NestedFileSystem> fileSystems = new HashMap<>();
 
  @Override
  public String getScheme() {

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/UriPathEncoder.java

@@ -28,7 +28,7 @@ final class UriPathEncoder {
 
  // Based on org.springframework.web.util.UriUtils
 
- private static char[] ALLOWED = "/:@-._~!$&\'()*+,;=".toCharArray();
+ private static final char[] ALLOWED = "/:@-._~!$&\'()*+,;=".toCharArray();
 
  private UriPathEncoder() {
  }