Upgrade to spring-javaformat 0.0.43

mhalbritter · mhalbritter · commit 1d45016d8cc4 · 2024-08-14T16:32:41.000+02:00
Closes gh-41853
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/info/InfoContributorFallback.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorFallback.java
@@ -37,6 +37,6 @@ public enum InfoContributorFallback {
 	/**
 	 * Do not fall back, thereby disabling the info contributor.
 	 */
-	DISABLE;
+	DISABLE
 
 }
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java
@@ -116,7 +116,7 @@ public enum HistogramType {
 		/**
 		 * Delta histogram.
 		 */
-		DELTA;
+		DELTA
 
 	}
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/TracingProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/TracingProperties.java
@@ -241,7 +241,7 @@ public enum PropagationType {
 			 * <a href="https://github.com/openzipkin/b3-propagation#multiple-headers">B3
 			 * multiple headers</a> propagation.
 			 */
-			B3_MULTI;
+			B3_MULTI
 
 		}
 
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/cassandra/CassandraProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java
@@ -482,7 +482,7 @@ public enum Compression {
 		/**
 		 * No compression.
 		 */
-		NONE;
+		NONE
 
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java
@@ -224,7 +224,7 @@ public enum ConstructorDetectorStrategy {
 		 * Refuse to decide implicit mode and instead throw an InvalidDefinitionException
 		 * for ambiguous cases.
 		 */
-		EXPLICIT_ONLY;
+		EXPLICIT_ONLY
 
 	}
 
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
@@ -463,6 +463,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/liquibase/LiquibasePropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibasePropertiesTests.java
@@ -33,7 +33,7 @@
  *
  * @author Andy Wilkinson
  */
-public class LiquibasePropertiesTests {
+class LiquibasePropertiesTests {
 
 	@Test
 	void valuesOfShowSummaryMatchValuesOfUpdateSummaryEnum() {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesClientSettingsBuilderCustomizerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesClientSettingsBuilderCustomizerTests.java
@@ -31,6 +31,7 @@
  * Tests for {@link MongoPropertiesClientSettingsBuilderCustomizer}.
  *
  * @author Scott Frederick
+ * @deprecated since 3.1.0 for removal in 3.3.0
  */
 @Deprecated(since = "3.1.0", forRemoval = true)
 class MongoPropertiesClientSettingsBuilderCustomizerTests {
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java
@@ -211,7 +211,7 @@ enum UseMainMethod {
 		 * that class does not have a main method, a test-specific
 		 * {@link SpringApplication} will be used.
 		 */
-		WHEN_AVAILABLE;
+		WHEN_AVAILABLE
 
 	}
 
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-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java
@@ -42,7 +42,7 @@
 @DisabledIfDockerUnavailable
 @ExtendWith(OutputCaptureExtension.class)
 @ImportTestcontainers(Containers.class)
-public class TestContainersParallelStartupWithImportTestcontainersIntegrationTests {
+class TestContainersParallelStartupWithImportTestcontainersIntegrationTests {
 
 	@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/context/config/ConfigData.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigData.java
@@ -280,7 +280,7 @@ public enum Option {
 		 * profile specific sibling imports.
 		 * @since 2.4.5
 		 */
-		PROFILE_SPECIFIC;
+		PROFILE_SPECIFIC
 
 	}
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributor.java
@@ -470,7 +470,7 @@ enum Kind {
 		/**
 		 * A valid location that contained nothing to load.
 		 */
-		EMPTY_LOCATION;
+		EMPTY_LOCATION
 
 	}
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributors.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributors.java
@@ -326,7 +326,7 @@ enum BinderOption {
 		/**
 		 * Throw an exception if an inactive contributor contains a bound value.
 		 */
-		FAIL_ON_BIND_TO_INACTIVE_SOURCE;
+		FAIL_ON_BIND_TO_INACTIVE_SOURCE
 
 	}
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindMethod.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindMethod.java
@@ -32,6 +32,6 @@ public enum BindMethod {
 	/**
 	 * Value object using constructor binding.
 	 */
-	VALUE_OBJECT;
+	VALUE_OBJECT
 
 }
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/main/java/org/springframework/boot/web/server/GracefulShutdownResult.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/GracefulShutdownResult.java
@@ -39,6 +39,6 @@ public enum GracefulShutdownResult {
 	/**
 	 * The server was shutdown immediately, ignoring any active requests.
 	 */
-	IMMEDIATE;
+	IMMEDIATE
 
 }
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/Shutdown.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/Shutdown.java
@@ -33,6 +33,6 @@ public enum Shutdown {
 	/**
 	 * The {@link WebServer} should shut down immediately.
 	 */
-	IMMEDIATE;
+	IMMEDIATE
 
 }
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-project/spring-boot/src/test/java/org/springframework/boot/web/server/SslConfigurationValidatorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/SslConfigurationValidatorTests.java
@@ -30,6 +30,7 @@
  * Tests for {@link SslConfigurationValidator}.
  *
  * @author Chris Bono
+ * @deprecated since 3.1.0 for removal in 3.3.0
  */
 @SuppressWarnings("removal")
 @Deprecated(since = "3.1.0", forRemoval = true)
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
`@@ -37,6 +37,6 @@ public enum InfoContributorFallback {`
`37`	`37`	`/**`
`38`	`38`	`* Do not fall back, thereby disabling the info contributor.`
`39`	`39`	`*/`
`40`		`- DISABLE;`
	`40`	`+ DISABLE`
`41`	`41`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public enum HistogramType {`
`116`	`116`	`/**`
`117`	`117`	`* Delta histogram.`
`118`	`118`	`*/`
`119`		`- DELTA;`
	`119`	`+ DELTA`
`120`	`120`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ public enum PropagationType {`
`241`	`241`	`* <a href="https://github.com/openzipkin/b3-propagation#multiple-headers">B3`
`242`	`242`	`* multiple headers</a> propagation.`
`243`	`243`	`*/`
`244`		`- B3_MULTI;`
	`244`	`+ B3_MULTI`
`245`	`245`
`246`	`246`	`}`
`247`	`247`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`* Tests for {@link InfluxDbHealthContributorAutoConfiguration}.`
`32`	`32`	`*`
`33`	`33`	`* @author Eddú Meléndez`
	`34`	`+ * @deprecated since 3.2.0 for removal in 3.4.0`
`34`	`35`	`*/`
`35`	`36`	`@SuppressWarnings("removal")`
`36`	`37`	`@Deprecated(since = "3.2.0", forRemoval = true)`
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
`@@ -482,7 +482,7 @@ public enum Compression {`
`482`	`482`	`/**`
`483`	`483`	`* No compression.`
`484`	`484`	`*/`
`485`		`- NONE;`
	`485`	`+ NONE`
`486`	`486`
`487`	`487`	`}`
`488`	`488`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public enum ConstructorDetectorStrategy {`
`224`	`224`	`* Refuse to decide implicit mode and instead throw an InvalidDefinitionException`
`225`	`225`	`* for ambiguous cases.`
`226`	`226`	`*/`
`227`		`- EXPLICIT_ONLY;`
	`227`	`+ EXPLICIT_ONLY`
`228`	`228`
`229`	`229`	`}`
`230`	`230`