Merge branch '3.2.x' into 3.3.x

mhalbritter · mhalbritter · commit 2a84fe5760a7 · 2024-08-14T16:47:52.000+02:00
Closes gh-41857
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
@@ -1 +1 @@
-javaFormatVersion=0.0.41
+javaFormatVersion=0.0.43
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java
@@ -54,6 +54,7 @@ public class PrometheusProperties {
 
 	/**
 	 * Histogram type for backing DistributionSummary and Timer.
+	 * @deprecated since 3.3.0 for removal in 3.5.0
 	 */
 	@Deprecated(since = "3.3.0", forRemoval = true)
 	private HistogramFlavor histogramFlavor = HistogramFlavor.Prometheus;
@@ -230,7 +231,7 @@ public void setShutdownOperation(ShutdownOperation shutdownOperation) {
 	@Deprecated(since = "3.3.0", forRemoval = true)
 	public enum HistogramFlavor {
 
-		Prometheus, VictoriaMetrics;
+		Prometheus, VictoriaMetrics
 
 	}
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinRestTemplateSender.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinRestTemplateSender.java
@@ -31,6 +31,7 @@
  *
  * @author Moritz Halbritter
  * @author Stefan Bratanov
+ * @deprecated since 3.3.0 for removal in 3.5.0 in favor of {@link ZipkinHttpClientSender}
  */
 @Deprecated(since = "3.3.0", forRemoval = true)
 class ZipkinRestTemplateSender extends HttpSender {
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSender.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSender.java
@@ -30,6 +30,7 @@
  *
  * @author Stefan Bratanov
  * @author Moritz Halbritter
+ * @deprecated since 3.3.0 for removal in 3.5.0 in favor of {@link ZipkinHttpClientSender}
  */
 @Deprecated(since = "3.3.0", forRemoval = true)
 class ZipkinWebClientSender extends HttpSender {
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthContributorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthContributorAutoConfigurationTests.java
@@ -31,6 +31,7 @@
  * Tests for {@link InfluxDbHealthContributorAutoConfiguration}.
  *
  * @author Eddú Meléndez
+ * @deprecated since 3.2.0 for removal in 3.4.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.2.0", forRemoval = true)
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/jersey/JerseyWebEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/jersey/JerseyWebEndpointIntegrationTests.java
@@ -62,10 +62,10 @@
  * @author Andy Wilkinson
  * @see JerseyEndpointResourceFactory
  */
-public class JerseyWebEndpointIntegrationTests
+class JerseyWebEndpointIntegrationTests
 		extends AbstractWebEndpointIntegrationTests<AnnotationConfigServletWebServerApplicationContext> {
 
-	public JerseyWebEndpointIntegrationTests() {
+	JerseyWebEndpointIntegrationTests() {
 		super(JerseyWebEndpointIntegrationTests::createApplicationContext,
 				JerseyWebEndpointIntegrationTests::applyAuthenticatedConfiguration);
 	}
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/influx/InfluxDbHealthIndicatorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/influx/InfluxDbHealthIndicatorTests.java
@@ -35,6 +35,7 @@
  * Tests for {@link InfluxDbHealthIndicator}.
  *
  * @author Eddú Meléndez
+ * @deprecated since 3.2.0 for removal in 3.4.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.2.0", forRemoval = true)
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
@@ -491,6 +491,7 @@ public static class Tomcat {
 
 		/**
 		 * Whether to reject requests with illegal header names or values.
+		 * @deprecated since 2.7.12 for removal in 3.3.0
 		 */
 		@Deprecated(since = "2.7.12", forRemoval = true) // Remove in 3.3
 		private boolean rejectIllegalHeader = true;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java
@@ -41,6 +41,7 @@
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Phillip Webb
+ * @deprecated since 3.2.0 for removal in 3.4.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.2.0", forRemoval = true)
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java
@@ -39,6 +39,7 @@
  * Tests for {@link JooqExceptionTranslator}
  *
  * @author Andy Wilkinson
+ * @deprecated since 3.3.0 for removal in 3.5.0
  */
 @Deprecated(since = "3.3.0")
 @SuppressWarnings("removal")
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestDockerTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestDockerTests.java
@@ -42,7 +42,7 @@
  */
 @DataLdapTest
 @Testcontainers(disabledWithoutDocker = true)
-public class DataLdapTestDockerTests {
+class DataLdapTestDockerTests {
 
 	@Container
 	@ServiceConnection
diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerImportTestcontainersTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerImportTestcontainersTests.java
@@ -35,7 +35,7 @@
 @SpringBootTest
 @DisabledIfDockerUnavailable
 @ImportTestcontainers(LoadTimeWeaverAwareConsumerContainers.class)
-public class LoadTimeWeaverAwareConsumerImportTestcontainersTests implements LoadTimeWeaverAwareConsumerContainers {
+class LoadTimeWeaverAwareConsumerImportTestcontainersTests implements LoadTimeWeaverAwareConsumerContainers {
 
 	@Autowired
 	private LoadTimeWeaverAwareConsumer consumer;
diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupIntegrationTests.java
@@ -43,7 +43,7 @@
 @TestPropertySource(properties = "spring.testcontainers.beans.startup=parallel")
 @DisabledIfDockerUnavailable
 @ExtendWith(OutputCaptureExtension.class)
-public class TestContainersParallelStartupIntegrationTests {
+class TestContainersParallelStartupIntegrationTests {
 
 	@Test
 	void startsInParallel(CapturedOutput out) {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedProperties.java
@@ -25,6 +25,7 @@
  * Deprecated configuration properties.
  *
  * @author Stephane Nicoll
+ * @deprecated deprecated
  */
 @Getter
 @Setter
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedClassMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedClassMethodConfig.java
@@ -22,6 +22,7 @@
  * Sample for testing method configuration with deprecated class.
  *
  * @author Stephane Nicoll
+ * @deprecated deprecated
  */
 @Deprecated
 public class DeprecatedClassMethodConfig {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedProperties.java
@@ -22,6 +22,7 @@
  * Deprecated configuration properties.
  *
  * @author Stephane Nicoll
+ * @deprecated deprecated
  */
 @Deprecated
 @ConfigurationProperties(prefix = "deprecated")
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/VirtualZipPerformanceTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/VirtualZipPerformanceTests.java
@@ -37,7 +37,7 @@
  * @author Phillip Webb
  */
 @Disabled("Only used for manual testing")
-public class VirtualZipPerformanceTests {
+class VirtualZipPerformanceTests {
 
 	@TempDir
 	Path temp;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java
@@ -223,6 +223,8 @@ private static HttpClient createHttpClient(Duration readTimeout, SslBundle sslBu
 	/**
 	 * Support for
 	 * {@link org.springframework.http.client.OkHttp3ClientHttpRequestFactory}.
+	 *
+	 * @deprecated since 3.2.0 for removal in 3.4.0
 	 */
 	@Deprecated(since = "3.2.0", forRemoval = true)
 	@SuppressWarnings("removal")
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java
@@ -35,6 +35,7 @@
  * Tests for {@link DelegatingApplicationContextInitializer}.
  *
  * @author Phillip Webb
+ * @deprecated since 3.2.0 for removal in 3.4.0
  */
 @Deprecated(since = "3.2.0", forRemoval = true)
 @SuppressWarnings("removal")
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java
@@ -36,6 +36,7 @@
  * Tests for {@link DelegatingApplicationListener}.
  *
  * @author Dave Syer
+ * @deprecated since 3.2.0 for removal in 3.4.0
  */
 @Deprecated(since = "3.2.0", forRemoval = true)
 @SuppressWarnings("removal")
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesOkHttp3Tests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesOkHttp3Tests.java
@@ -33,10 +33,11 @@
  * client.
  *
  * @author Andy Wilkinson
+ * @deprecated since 3.2.0 for removal in 3.4.0
  */
 @ClassPathOverrides("com.squareup.okhttp3:okhttp:3.14.9")
 @ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar" })
-@Deprecated(since = "3.2.0")
+@Deprecated(since = "3.2.0", forRemoval = true)
 @SuppressWarnings("removal")
 class ClientHttpRequestFactoriesOkHttp3Tests
 		extends AbstractClientHttpRequestFactoriesTests<OkHttp3ClientHttpRequestFactory> {
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesOkHttp4Tests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesOkHttp4Tests.java
@@ -32,9 +32,10 @@
  * client.
  *
  * @author Andy Wilkinson
+ * @deprecated since 3.2.0 for removal in 3.4.0
  */
 @ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar" })
-@Deprecated(since = "3.2.0")
+@Deprecated(since = "3.2.0", forRemoval = true)
 @SuppressWarnings("removal")
 class ClientHttpRequestFactoriesOkHttp4Tests
 		extends AbstractClientHttpRequestFactoriesTests<OkHttp3ClientHttpRequestFactory> {
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/java/smoketest/ant/SampleAntApplicationIT.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/java/smoketest/ant/SampleAntApplicationIT.java
@@ -33,7 +33,7 @@
  * @author Dave Syer
  * @author Phillip Webb
  */
-public class SampleAntApplicationIT {
+class SampleAntApplicationIT {
 
 	@Test
 	void runJar() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-javaFormatVersion=0.0.41`
	`1`	`+javaFormatVersion=0.0.43`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`*`
`32`	`32`	`* @author Moritz Halbritter`
`33`	`33`	`* @author Stefan Bratanov`
	`34`	`+ * @deprecated since 3.3.0 for removal in 3.5.0 in favor of {@link ZipkinHttpClientSender}`
`34`	`35`	`*/`
`35`	`36`	`@Deprecated(since = "3.3.0", forRemoval = true)`
`36`	`37`	`class ZipkinRestTemplateSender extends HttpSender {`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`* @author Stefan Bratanov`
`32`	`32`	`* @author Moritz Halbritter`
	`33`	`+ * @deprecated since 3.3.0 for removal in 3.5.0 in favor of {@link ZipkinHttpClientSender}`
`33`	`34`	`*/`
`34`	`35`	`@Deprecated(since = "3.3.0", forRemoval = true)`
`35`	`36`	`class ZipkinWebClientSender extends HttpSender {`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`* Tests for {@link InfluxDbHealthIndicator}.`
`36`	`36`	`*`
`37`	`37`	`* @author Eddú Meléndez`
	`38`	`+ * @deprecated since 3.2.0 for removal in 3.4.0`
`38`	`39`	`*/`
`39`	`40`	`@SuppressWarnings("removal")`
`40`	`41`	`@Deprecated(since = "3.2.0", forRemoval = true)`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`* Tests for {@link JooqExceptionTranslator}`
`40`	`40`	`*`
`41`	`41`	`* @author Andy Wilkinson`
	`42`	`+ * @deprecated since 3.3.0 for removal in 3.5.0`
`42`	`43`	`*/`
`43`	`44`	`@Deprecated(since = "3.3.0")`
`44`	`45`	`@SuppressWarnings("removal")`