From 1d45016d8cc41cb9d8816d877d237d2b8d00099c Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 14 Aug 2024 12:32:42 +0200 Subject: [PATCH] Upgrade to spring-javaformat 0.0.43 Closes gh-41853 --- buildSrc/gradle.properties | 2 +- .../actuate/autoconfigure/info/InfoContributorFallback.java | 2 +- .../metrics/export/signalfx/SignalFxProperties.java | 2 +- .../boot/actuate/autoconfigure/tracing/TracingProperties.java | 2 +- .../InfluxDbHealthContributorAutoConfigurationTests.java | 1 + .../web/jersey/JerseyWebEndpointIntegrationTests.java | 4 ++-- .../boot/actuate/influx/InfluxDbHealthIndicatorTests.java | 1 + .../boot/autoconfigure/cassandra/CassandraProperties.java | 2 +- .../boot/autoconfigure/jackson/JacksonProperties.java | 2 +- .../boot/autoconfigure/web/ServerProperties.java | 1 + .../autoconfigure/influx/InfluxDbAutoConfigurationTests.java | 1 + .../autoconfigure/liquibase/LiquibasePropertiesTests.java | 2 +- .../MongoPropertiesClientSettingsBuilderCustomizerTests.java | 1 + .../org/springframework/boot/test/context/SpringBootTest.java | 2 +- .../LoadTimeWeaverAwareConsumerImportTestcontainersTests.java | 2 +- .../TestContainersParallelStartupIntegrationTests.java | 2 +- ...rallelStartupWithImportTestcontainersIntegrationTests.java | 2 +- .../lombok/LombokDeprecatedProperties.java | 1 + .../method/DeprecatedClassMethodConfig.java | 1 + .../boot/configurationsample/simple/DeprecatedProperties.java | 1 + .../boot/loader/zip/VirtualZipPerformanceTests.java | 2 +- .../org/springframework/boot/context/config/ConfigData.java | 2 +- .../boot/context/config/ConfigDataEnvironmentContributor.java | 2 +- .../context/config/ConfigDataEnvironmentContributors.java | 2 +- .../boot/context/properties/bind/BindMethod.java | 2 +- .../boot/web/client/ClientHttpRequestFactories.java | 2 ++ .../boot/web/server/GracefulShutdownResult.java | 2 +- .../java/org/springframework/boot/web/server/Shutdown.java | 2 +- .../config/DelegatingApplicationContextInitializerTests.java | 1 + .../context/config/DelegatingApplicationListenerTests.java | 1 + .../web/client/ClientHttpRequestFactoriesOkHttp3Tests.java | 3 ++- .../web/client/ClientHttpRequestFactoriesOkHttp4Tests.java | 3 ++- .../boot/web/server/SslConfigurationValidatorTests.java | 1 + .../src/test/java/smoketest/ant/SampleAntApplicationIT.java | 2 +- 34 files changed, 38 insertions(+), 23 deletions(-) diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index 7c8d635fa28..2a3dd72a183 100644 --- 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 index 0f78db5cbe4..b93e148b4d7 100644 --- 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 index 3a5735537a3..d1afe6fd8a9 100644 --- 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 class SignalFxProperties extends StepRegistryProperties { /** * 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 index c38ef94d125..9d02add3482 100644 --- 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 class TracingProperties { * B3 * multiple headers 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 index 64d2757f26d..16129b8f981 100644 --- 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 @@ import static org.mockito.Mockito.mock; * 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 index ee4669868ed..85248ba4ebe 100644 --- 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 @@ import org.springframework.web.filter.OncePerRequestFilter; * @author Andy Wilkinson * @see JerseyEndpointResourceFactory */ -public class JerseyWebEndpointIntegrationTests +class JerseyWebEndpointIntegrationTests extends AbstractWebEndpointIntegrationTests { - 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 index f874582108f..a0cc5e8889d 100644 --- 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 @@ import static org.mockito.Mockito.mock; * 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 index bd25ed980f8..dcc1b07a1c7 100644 --- 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 class CassandraProperties { /** * 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 index fe3a67e028a..31e3da6200f 100644 --- 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 class JacksonProperties { * 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 index e8742b414f6..d41d1be59c9 100644 --- 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 class ServerProperties { /** * 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 index fade2e3b281..c1e955176c2 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThat; * @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 index 57f6025f46a..66c0c2f6768 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThat; * * @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 index 021d298523c..1350a69808f 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThat; * 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 index 95a053363f4..7a5cffa0387 100644 --- 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 @@ public @interface SpringBootTest { * 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 index a41ad8aea17..85e6676c5e4 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThat; @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 index b87412d0cc5..0dde259bbaf 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThat; @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 index 7635a23228c..e3a9cfb57fb 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThat; @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 index f73a60d8c72..cc86aa48689 100644 --- 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 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * 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 index 8289ab0bc7c..6621e3d5d68 100644 --- 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 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * 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 index 2bf4d4c7c5e..81a75b39344 100644 --- 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 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * 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 index 3e4e4ec4a99..fe57d30cf77 100644 --- 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 @@ import org.junit.jupiter.api.io.TempDir; * @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 index a2c4386341d..9482c48afe1 100644 --- 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 final class ConfigData { * 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 index 4311c48e051..d5ffe308344 100644 --- 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 @@ class ConfigDataEnvironmentContributor implements Iterable { 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 index 8df47c1c6e6..6e03f459188 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThat; * 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 { 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 index df969774796..68f6d9c943f 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; * 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 index 9bfcdd1d633..acca8218aa1 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * @author Phillip Webb */ -public class SampleAntApplicationIT { +class SampleAntApplicationIT { @Test void runJar() throws Exception {