Merge pull request #23081 from izeye

* pr/23081:
  Polish

Closes gh-23081

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/Include.java

@@ -57,7 +57,6 @@ public enum Include {
 	PRINCIPAL,
 
 	/**
-	 *
 	 * Include the remote address.
 	 */
 	REMOTE_ADDRESS,

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

@@ -76,7 +76,7 @@ class SharedMetadataReaderFactoryContextInitializer
 	static class CachingMetadataReaderFactoryPostProcessor
 			implements BeanDefinitionRegistryPostProcessor, PriorityOrdered {
 
-		private ConfigurableApplicationContext context;
+		private final ConfigurableApplicationContext context;
 
 		CachingMetadataReaderFactoryPostProcessor(ConfigurableApplicationContext context) {
 			this.context = context;

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

@@ -101,8 +101,8 @@ public class Repackager extends Packager {
 	public void repackage(File destination, Libraries libraries, LaunchScript launchScript, FileTime lastModifiedTime)
 			throws IOException {
 		Assert.isTrue(destination != null && !destination.isDirectory(), "Invalid destination");
-		getLayout(); // get layout early
+		Layout layout = getLayout(); // get layout early
-		if (lastModifiedTime != null && getLayout() instanceof War) {
+		if (lastModifiedTime != null && layout instanceof War) {
 			throw new IllegalStateException("Reproducible repackaging is not supported with war packaging");
 		}
 		destination = destination.getAbsoluteFile();

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

@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
- * Annotation used to fork the classpath. This can be helpful were neither
+ * Annotation used to fork the classpath. This can be helpful where neither
  * {@link ClassPathExclusions} or {@link ClassPathOverrides} are needed, but just a copy
  * of the classpath.
  *

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

@@ -259,7 +259,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
 	 */
 	private static class PropertySourceOrderingPostProcessor implements BeanFactoryPostProcessor, Ordered {
 
-		private ConfigurableApplicationContext context;
+		private final ConfigurableApplicationContext context;
 
 		PropertySourceOrderingPostProcessor(ConfigurableApplicationContext context) {
 			this.context = context;