Merge branch '3.1.x' into 3.2.x

Closes gh-39091

buildSrc/build.gradle

@@ -31,8 +31,13 @@ if (versions.springFramework.contains("-")) {
 	}
 }
 
+checkstyle {
+	toolVersion = "10.12.4"
+}
+
 dependencies {
-	checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
+	checkstyle("com.puppycrawl.tools:checkstyle:${checkstyle.toolVersion}")
+	checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")
 
 	implementation(platform("org.springframework:spring-framework-bom:${versions.springFramework}"))
 	implementation("com.diffplug.gradle:goomph:3.37.2")
@@ -58,10 +63,6 @@ dependencies {
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
-checkstyle {
-	toolVersion = "10.12.4"
-}
-
 gradlePlugin {
 	plugins {
 		annotationProcessorPlugin {

buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.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.
@@ -243,6 +243,8 @@ private void configureSpringJavaFormat(Project project) {
 		checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
 		String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 		DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();
+		checkstyleDependencies
+			.add(project.getDependencies().create("com.puppycrawl.tools:checkstyle:" + checkstyle.getToolVersion()));
 		checkstyleDependencies
 			.add(project.getDependencies().create("io.spring.javaformat:spring-javaformat-checkstyle:" + version));
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/SkipSslVerificationHttpRequestFactory.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.
@@ -62,7 +62,7 @@ private SSLSocketFactory createSslSocketFactory() throws Exception {
 		return context.getSocketFactory();
 	}
 
-	private static class SkipHostnameVerifier implements HostnameVerifier {
+	private static final class SkipHostnameVerifier implements HostnameVerifier {
 
 		@Override
 		public boolean verify(String s, SSLSession sslSession) {
@@ -71,7 +71,7 @@ public boolean verify(String s, SSLSession sslSession) {
 
 	}
 
-	private static class SkipX509TrustManager implements X509TrustManager {
+	private static final class SkipX509TrustManager implements X509TrustManager {
 
 		@Override
 		public X509Certificate[] getAcceptedIssuers() {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfiguration.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.
@@ -54,7 +54,7 @@ public LogFileWebEndpoint logFileWebEndpoint(ObjectProvider<LogFile> logFile,
 		return new LogFileWebEndpoint(logFile.getIfAvailable(), properties.getExternalFile());
 	}
 
-	private static class LogFileCondition extends SpringBootCondition {
+	private static final class LogFileCondition extends SpringBootCondition {
 
 		@Override
 		public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.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.
@@ -92,7 +92,7 @@ public MeterFilter jerseyMetricsUriTagFilter(MetricsProperties metricsProperties
 	/**
 	 * An {@link AnnotationFinder} that uses {@link AnnotationUtils}.
 	 */
-	private static class AnnotationUtilsAnnotationFinder implements AnnotationFinder {
+	private static final class AnnotationUtilsAnnotationFinder implements AnnotationFinder {
 
 		@Override
 		public <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.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.
@@ -311,7 +311,7 @@ protected RequestMatcher createDelegate(WebApplicationContext context,
 	/**
 	 * Factory used to create a {@link RequestMatcher}.
 	 */
-	private static class RequestMatcherFactory {
+	private static final class RequestMatcherFactory {
 
 		RequestMatcher antPath(RequestMatcherProvider matcherProvider, String... parts) {
 			StringBuilder pattern = new StringBuilder();

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryReactiveHealthEndpointWebExtensionTests.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.
@@ -75,7 +75,7 @@ void healthComponentsAlwaysPresent() {
 		});
 	}
 
-	private static class TestHealthIndicator implements HealthIndicator {
+	private static final class TestHealthIndicator implements HealthIndicator {
 
 		@Override
 		public Health health() {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryHealthEndpointWebExtensionTests.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.
@@ -70,7 +70,7 @@ void healthComponentsAlwaysPresent() {
 		});
 	}
 
-	private static class TestHealthIndicator implements HealthIndicator {
+	private static final class TestHealthIndicator implements HealthIndicator {
 
 		@Override
 		public Health health() {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.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.
@@ -138,7 +138,7 @@ CompositeHealthContributor brokerHealthContributor() {
 
 	}
 
-	private static class TestHealthEndpointGroup implements HealthEndpointGroup {
+	private static final class TestHealthEndpointGroup implements HealthEndpointGroup {
 
 		private final StatusAggregator statusAggregator = new SimpleStatusAggregator();
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.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.
@@ -561,11 +561,11 @@ public boolean supportsContext(Context context) {
 
 	}
 
-	private static class CustomContext extends Context {
+	private static final class CustomContext extends Context {
 
 	}
 
-	private static class CalledHandlers {
+	private static final class CalledHandlers {
 
 		private final List<ObservationHandler<?>> calledHandlers = new ArrayList<>();
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryConfigurerIntegrationTests.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.
@@ -74,7 +74,7 @@ Customizer2 customizer2(CalledCustomizers calledCustomizers) {
 
 	}
 
-	private static class CalledCustomizers {
+	private static final class CalledCustomizers {
 
 		private final List<ObservationRegistryCustomizer<?>> customizers = new ArrayList<>();
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryAutoConfigurationTests.java

@@ -140,7 +140,7 @@ void shouldRegisterSdkMeterProviderIfAvailable() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class UserConfiguration {
+	private static final class UserConfiguration {
 
 		@Bean
 		OpenTelemetry customOpenTelemetry() {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryPropertiesTests.java

@@ -48,7 +48,7 @@ void shouldNotDependOnOpenTelemetrySdk() {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties(OpenTelemetryProperties.class)
-	private static class TestConfiguration {
+	private static final class TestConfiguration {
 
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/r2dbc/R2dbcObservationAutoConfigurationTests.java

@@ -108,7 +108,7 @@ private static CapturingObservationHandler registerCapturingObservationHandler(
 		return handler;
 	}
 
-	private static class CapturingObservationHandler implements ObservationHandler<Context> {
+	private static final class CapturingObservationHandler implements ObservationHandler<Context> {
 
 		private final AtomicReference<Context> context = new AtomicReference<>();
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.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.
@@ -443,7 +443,7 @@ static class AdditionalSpanHandler extends SpanHandler {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class CustomConfiguration {
+	private static final class CustomConfiguration {
 
 		@Bean
 		Tracing customTracing() {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfigurationTests.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.
@@ -162,7 +162,7 @@ void shouldConfigureSpanTagAnnotationHandler() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class TracerConfiguration {
+	private static final class TracerConfiguration {
 
 		@Bean
 		Tracer tracer() {
@@ -172,7 +172,7 @@ Tracer tracer() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class PropagatorConfiguration {
+	private static final class PropagatorConfiguration {
 
 		@Bean
 		Propagator propagator() {
@@ -182,7 +182,7 @@ Propagator propagator() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class CustomConfiguration {
+	private static final class CustomConfiguration {
 
 		@Bean
 		DefaultTracingObservationHandler customDefaultTracingObservationHandler() {
@@ -218,7 +218,7 @@ SpanAspect customSpanAspect(MethodInvocationProcessor methodInvocationProcessor)
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class SpanTagAnnotationHandlerConfiguration {
+	private static final class SpanTagAnnotationHandlerConfiguration {
 
 		@Bean
 		SpanTagAnnotationHandler spanTagAnnotationHandler() {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/NoopTracerAutoConfigurationTests.java

@@ -65,7 +65,7 @@ void shouldBackOffIfMicrometerTracingIsMissing() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class CustomTracerConfiguration {
+	private static final class CustomTracerConfiguration {
 
 		@Bean
 		Tracer customTracer() {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfigurationTests.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.
@@ -309,7 +309,7 @@ private List<TextMapPropagator> getInjectors(TextMapPropagator propagator) {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class MeterProviderConfiguration {
+	private static final class MeterProviderConfiguration {
 
 		@Bean
 		MeterProvider meterProvider() {
@@ -322,7 +322,7 @@ MeterProvider meterProvider() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class AdditionalSpanProcessorConfiguration {
+	private static final class AdditionalSpanProcessorConfiguration {
 
 		@Bean
 		SpanProcessor customSpanProcessor() {
@@ -332,7 +332,7 @@ SpanProcessor customSpanProcessor() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class MultipleSpanExporterConfiguration {
+	private static final class MultipleSpanExporterConfiguration {
 
 		@Bean
 		SpanExporter spanExporter1() {
@@ -347,7 +347,7 @@ SpanExporter spanExporter2() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class CustomConfiguration {
+	private static final class CustomConfiguration {
 
 		@Bean
 		SpanProcessors customSpanProcessors() {
@@ -427,7 +427,7 @@ SpanCustomizer customSpanCustomizer() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class SdkTracerProviderCustomizationConfiguration {
+	private static final class SdkTracerProviderCustomizationConfiguration {
 
 		@Bean
 		@Order(1)
@@ -449,7 +449,7 @@ SdkTracerProviderBuilderCustomizer sdkTracerProviderBuilderCustomizerTwo() {
 
 	}
 
-	private static class DummySpanExporter implements SpanExporter {
+	private static final class DummySpanExporter implements SpanExporter {
 
 		@Override
 		public CompletableResultCode export(Collection<SpanData> spans) {
@@ -469,7 +469,7 @@ public CompletableResultCode shutdown() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class InMemoryRecordingSpanExporterConfiguration {
+	private static final class InMemoryRecordingSpanExporterConfiguration {
 
 		@Bean
 		InMemoryRecordingSpanExporter spanExporter() {
@@ -478,7 +478,7 @@ InMemoryRecordingSpanExporter spanExporter() {
 
 	}
 
-	private static class InMemoryRecordingSpanExporter implements SpanExporter {
+	private static final class InMemoryRecordingSpanExporter implements SpanExporter {
 
 		private final List<SpanData> exportedSpans = new ArrayList<>();
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpAutoConfigurationTests.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.
@@ -127,7 +127,7 @@ void testConnectionFactoryWithOverridesWhenUsingCustomConnectionDetails() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class CustomHttpExporterConfiguration {
+	private static final class CustomHttpExporterConfiguration {
 
 		@Bean
 		OtlpHttpSpanExporter customOtlpHttpSpanExporter() {
@@ -137,7 +137,7 @@ OtlpHttpSpanExporter customOtlpHttpSpanExporter() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static class CustomGrpcExporterConfiguration {
+	private static final class CustomGrpcExporterConfiguration {
 
 		@Bean
 		OtlpGrpcSpanExporter customOtlpGrpcSpanExporter() {