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/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 index ea5991ad4d2..c69429a48a9 100644 --- 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 class PrometheusProperties { @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 index 69246a7be19..de66c6a8fc3 100644 --- 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 @@ import org.springframework.web.client.RestTemplate; * * @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 index 9c3ffe38879..3f555defa1c 100644 --- 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 @@ import org.springframework.web.reactive.function.client.WebClient; * * @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/logging/opentelemetry/otlp/OtlpLoggingAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/otlp/OtlpLoggingAutoConfigurationIntegrationTests.java index 71b4b55c9dd..0e3e899c446 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/otlp/OtlpLoggingAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/otlp/OtlpLoggingAutoConfigurationIntegrationTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Toshiaki Maki */ -public class OtlpLoggingAutoConfigurationIntegrationTests { +class OtlpLoggingAutoConfigurationIntegrationTests { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withPropertyValues("spring.application.name=otlp-logs-test", 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-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 0c2e2b04d40..faa6c1a954b 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 @@ -491,6 +491,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/jooq/JooqExceptionTranslatorTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java index f53b34880b3..f5390c0f5e6 100644 --- 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 @@ import static org.mockito.Mockito.never; * 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 index 41bfacc3fee..a0bd5d14510 100644 --- 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 @@ import static org.springframework.boot.test.autoconfigure.AutoConfigurationImpor */ @DataLdapTest @Testcontainers(disabledWithoutDocker = true) -public class DataLdapTestDockerTests { +class DataLdapTestDockerTests { @Container @ServiceConnection diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java index 1886754f982..6048fc1da85 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java @@ -23,6 +23,7 @@ import org.springframework.util.ObjectUtils; * * @author Phillip Webb * @see DefinitionsParser + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java index dccfc135e5c..734527d3216 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java @@ -41,6 +41,7 @@ import org.springframework.util.StringUtils; * * @author Phillip Webb * @author Stephane Nicoll + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java index 04a6efa40fe..416e1deb914 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java @@ -37,6 +37,7 @@ import static org.mockito.Mockito.mock; * A complete definition that can be used to create a Mockito mock. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizer.java index 349d9371e1f..ad6f70474a5 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizer.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizer.java @@ -28,6 +28,7 @@ import org.springframework.test.context.MergedContextConfiguration; * A {@link ContextCustomizer} to add Mockito support. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactory.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactory.java index 9a179c7c564..9946ddfb1be 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactory.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactory.java @@ -27,6 +27,7 @@ import org.springframework.test.context.TestContextAnnotationUtils; * A {@link ContextCustomizerFactory} to add Mockito support. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java index 3468471eea1..9f46416ac3a 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java @@ -34,6 +34,7 @@ import org.springframework.core.annotation.MergedAnnotations; * @author Phillip Webb * @author Stephane Nicoll * @see Definition + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java index bf192207c6e..5a9bb64f5b3 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java @@ -37,6 +37,7 @@ import static org.mockito.Mockito.mock; * A complete definition that can be used to create a Mockito spy. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericExtensionTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericExtensionTests.java index d8349fe4238..539d5eeb6f2 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericExtensionTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericExtensionTests.java @@ -20,6 +20,7 @@ package org.springframework.boot.test.mock.mockito; * Concrete implementation of {@link AbstractMockBeanOnGenericTests}. * * @author Madhura Bhave + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericTests.java index 9277b429501..1d01a90ee06 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericTests.java @@ -31,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @param type of thing * @param type of something * @author Madhura Bhave + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java index cf4001e96c9..0758d11d9cc 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java @@ -36,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; * Tests for {@link DefinitionsParser}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanContextCachingTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanContextCachingTests.java index 78ed37a9b8c..6251f2ccb3a 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanContextCachingTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanContextCachingTests.java @@ -42,6 +42,7 @@ import static org.mockito.Mockito.mock; * Tests for application context caching when using {@link MockBean @MockBean}. * * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanForBeanFactoryIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanForBeanFactoryIntegrationTests.java index 1e00655c327..bab9e585918 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanForBeanFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanForBeanFactoryIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.Mockito.mock; * Test {@link MockBean @MockBean} for a factory bean. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForExistingBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForExistingBeanIntegrationTests.java index eb14904ff19..cd016b7757a 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForExistingBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForExistingBeanIntegrationTests.java @@ -35,6 +35,7 @@ import static org.mockito.BDDMockito.given; * existing beans. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForNewBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForNewBeanIntegrationTests.java index 9590989a761..8b537cf5d6a 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForNewBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForNewBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.given; * instances. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @ExtendWith(SpringExtension.class) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForExistingBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForExistingBeanIntegrationTests.java index 170a9dc8664..2558a095e72 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForExistingBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForExistingBeanIntegrationTests.java @@ -35,6 +35,7 @@ import static org.mockito.BDDMockito.given; * used to replace existing beans. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @ExtendWith(SpringExtension.class) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForNewBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForNewBeanIntegrationTests.java index 922b57f4aeb..6e95d7a081f 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForNewBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForNewBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.given; * used to inject new mock instances. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @ExtendWith(SpringExtension.class) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnContextHierarchyIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnContextHierarchyIntegrationTests.java index cb7a65d0ace..ba5fad0a6e8 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnContextHierarchyIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnContextHierarchyIntegrationTests.java @@ -20,10 +20,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBeanOnContextHierarchyIntegrationTests.ChildConfig; -import org.springframework.boot.test.mock.mockito.MockBeanOnContextHierarchyIntegrationTests.ParentConfig; -import org.springframework.boot.test.mock.mockito.example.ExampleService; -import org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Configuration; @@ -38,12 +34,13 @@ import static org.assertj.core.api.Assertions.assertThat; * {@link ContextHierarchy @ContextHierarchy}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) @ExtendWith(SpringExtension.class) -@ContextHierarchy({ @ContextConfiguration(classes = ParentConfig.class), - @ContextConfiguration(classes = ChildConfig.class) }) +@ContextHierarchy({ @ContextConfiguration(classes = MockBeanOnContextHierarchyIntegrationTests.ParentConfig.class), + @ContextConfiguration(classes = MockBeanOnContextHierarchyIntegrationTests.ChildConfig.class) }) class MockBeanOnContextHierarchyIntegrationTests { @Autowired @@ -53,22 +50,30 @@ class MockBeanOnContextHierarchyIntegrationTests { void testMocking() { ApplicationContext context = this.childConfig.getContext(); ApplicationContext parentContext = context.getParent(); - assertThat(parentContext.getBeanNamesForType(ExampleService.class)).hasSize(1); - assertThat(parentContext.getBeanNamesForType(ExampleServiceCaller.class)).isEmpty(); - assertThat(context.getBeanNamesForType(ExampleService.class)).isEmpty(); - assertThat(context.getBeanNamesForType(ExampleServiceCaller.class)).hasSize(1); - assertThat(context.getBean(ExampleService.class)).isNotNull(); - assertThat(context.getBean(ExampleServiceCaller.class)).isNotNull(); + assertThat(parentContext + .getBeanNamesForType(org.springframework.boot.test.mock.mockito.example.ExampleService.class)).hasSize(1); + assertThat(parentContext + .getBeanNamesForType(org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller.class)) + .isEmpty(); + assertThat(context.getBeanNamesForType(org.springframework.boot.test.mock.mockito.example.ExampleService.class)) + .isEmpty(); + assertThat(context + .getBeanNamesForType(org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller.class)) + .hasSize(1); + assertThat(context.getBean(org.springframework.boot.test.mock.mockito.example.ExampleService.class)) + .isNotNull(); + assertThat(context.getBean(org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller.class)) + .isNotNull(); } @Configuration(proxyBeanMethods = false) - @MockBean(ExampleService.class) + @MockBean(org.springframework.boot.test.mock.mockito.example.ExampleService.class) static class ParentConfig { } @Configuration(proxyBeanMethods = false) - @MockBean(ExampleServiceCaller.class) + @MockBean(org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller.class) static class ChildConfig implements ApplicationContextAware { private ApplicationContext context; diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnScopedProxyTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnScopedProxyTests.java index e7103451b67..0ba686e6721 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnScopedProxyTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnScopedProxyTests.java @@ -38,6 +38,7 @@ import static org.mockito.BDDMockito.given; * * @author Phillip Webb * @see gh-5724 + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForExistingBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForExistingBeanIntegrationTests.java index 1127cbbb749..6051d06a191 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForExistingBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForExistingBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.given; * Test {@link MockBean @MockBean} on a test class can be used to replace existing beans. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForNewBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForNewBeanIntegrationTests.java index bd4e2899dd3..9d14d1b7411 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForNewBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForNewBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.given; * instances. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanCacheIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanCacheIntegrationTests.java index 3caa26a85a5..6e8bbc80a19 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanCacheIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanCacheIntegrationTests.java @@ -36,6 +36,7 @@ import static org.mockito.BDDMockito.given; * * @author Phillip Webb * @see MockBeanOnTestFieldForExistingBeanIntegrationTests + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanConfig.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanConfig.java index 4232599fc0f..1210206ad09 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanConfig.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanConfig.java @@ -27,6 +27,7 @@ import org.springframework.context.annotation.Import; * config to trigger caching. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanIntegrationTests.java index c30b5e7b400..1b9416c18fc 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.given; * * @author Phillip Webb * @see MockBeanOnTestFieldForExistingBeanCacheIntegrationTests + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java index 9a4e5702dc6..d2cb657f275 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java @@ -39,6 +39,7 @@ import static org.mockito.BDDMockito.then; * * @author Stephane Nicoll * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForNewBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForNewBeanIntegrationTests.java index e704b6da099..b534ccc743a 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForNewBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForNewBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.given; * instances. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAopProxyTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAopProxyTests.java index 21516a6a9e8..a70788e23c6 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAopProxyTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAopProxyTests.java @@ -45,6 +45,7 @@ import static org.mockito.Mockito.times; * * @author Phillip Webb * @see 5837 + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java index d5c0b5e6f9c..4d062f934d9 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java @@ -33,6 +33,7 @@ import static org.mockito.BDDMockito.given; * Tests for a mock bean where the mocked interface has an async method. * * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java index 212d0582611..a3a68c1d309 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java @@ -36,6 +36,7 @@ import static org.mockito.BDDMockito.given; * {@link DirtiesContext @DirtiesContext} and {@link ClassMode#BEFORE_EACH_TEST_METHOD}. * * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithGenericsOnTestFieldForNewBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithGenericsOnTestFieldForNewBeanIntegrationTests.java index 3d20f3e42f8..8553b5cddeb 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithGenericsOnTestFieldForNewBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithGenericsOnTestFieldForNewBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.given; * instances. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithInjectedFieldIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithInjectedFieldIntegrationTests.java index 65dd47799d0..7ff0d6e082a 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithInjectedFieldIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithInjectedFieldIntegrationTests.java @@ -31,6 +31,7 @@ import static org.mockito.BDDMockito.given; * Tests for a mock bean where the class being mocked uses field injection. * * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithSpringMethodRuleRepeatJUnit4IntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithSpringMethodRuleRepeatJUnit4IntegrationTests.java index 5f736ccff97..43576ada919 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithSpringMethodRuleRepeatJUnit4IntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithSpringMethodRuleRepeatJUnit4IntegrationTests.java @@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Andy Wilkinson * @see gh-27693 + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockDefinitionTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockDefinitionTests.java index 2273cbd77be..f349e9e8a46 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockDefinitionTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockDefinitionTests.java @@ -33,6 +33,7 @@ import static org.mockito.Mockito.mock; * Tests for {@link MockDefinition}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockResetTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockResetTests.java index 50b27ea053f..a2cddb61a78 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockResetTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockResetTests.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.withSettings; * Tests for {@link MockReset}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactoryTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactoryTests.java index 8e4a0e283c5..4081af4e36f 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactoryTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactoryTests.java @@ -26,6 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; * Tests for {@link MockitoContextCustomizerFactory}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerTests.java index d8583321388..203b4288c31 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerTests.java @@ -33,6 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; * Tests for {@link MockitoContextCustomizer}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java index ea2c90efe6f..e492abc0e90 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java @@ -50,6 +50,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; * @author Andy Wilkinson * @author Andreas Neiser * @author Madhura Bhave + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerIntegrationTests.java index deb85d05e69..fea91da20af 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerIntegrationTests.java @@ -49,6 +49,7 @@ import static org.mockito.BDDMockito.given; * Integration tests for {@link MockitoTestExecutionListener}. * * @author Moritz Halbritter + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java index 2a00553e355..95b7e02b845 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java @@ -41,6 +41,7 @@ import static org.mockito.Mockito.mock; * Tests for {@link MockitoTestExecutionListener}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/QualifierDefinitionTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/QualifierDefinitionTests.java index 5992f47278e..4b7fdeaffaa 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/QualifierDefinitionTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/QualifierDefinitionTests.java @@ -40,6 +40,7 @@ import static org.mockito.BDDMockito.then; * Tests for {@link QualifierDefinition}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java index ea0cdfa6c56..e985dbe1774 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java @@ -39,6 +39,7 @@ import static org.mockito.Mockito.mock; * * @author Phillip Webb * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java index 44eabef46fb..c6c18e63932 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java @@ -25,6 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat; * Integration tests for {@link SpringBootMockResolver}. * * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverTests.java index 656c522cf46..138bf78ae13 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverTests.java @@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; * Tests for {@link SpringBootMockResolver}. * * @author Moritz Halbritter + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForExistingBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForExistingBeanIntegrationTests.java index c9ec81c330c..2b424acac20 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForExistingBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForExistingBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.then; * beans. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForNewBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForNewBeanIntegrationTests.java index fd87c96de25..10049592428 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForNewBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForNewBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.then; * instances. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForExistingBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForExistingBeanIntegrationTests.java index fbbc2836abb..ed0c862b673 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForExistingBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForExistingBeanIntegrationTests.java @@ -35,6 +35,7 @@ import static org.mockito.BDDMockito.then; * to replace existing beans. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForNewBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForNewBeanIntegrationTests.java index 34b62aec755..9a85a37b3c2 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForNewBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForNewBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.then; * to inject new spy instances. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnContextHierarchyIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnContextHierarchyIntegrationTests.java index ed45a279fa9..b9763345da0 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnContextHierarchyIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnContextHierarchyIntegrationTests.java @@ -20,11 +20,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.SpyBeanOnContextHierarchyIntegrationTests.ChildConfig; -import org.springframework.boot.test.mock.mockito.SpyBeanOnContextHierarchyIntegrationTests.ParentConfig; -import org.springframework.boot.test.mock.mockito.example.ExampleService; -import org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller; -import org.springframework.boot.test.mock.mockito.example.SimpleExampleService; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Configuration; @@ -39,12 +34,13 @@ import static org.assertj.core.api.Assertions.assertThat; * {@link ContextHierarchy @ContextHierarchy}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) @ExtendWith(SpringExtension.class) -@ContextHierarchy({ @ContextConfiguration(classes = ParentConfig.class), - @ContextConfiguration(classes = ChildConfig.class) }) +@ContextHierarchy({ @ContextConfiguration(classes = SpyBeanOnContextHierarchyIntegrationTests.ParentConfig.class), + @ContextConfiguration(classes = SpyBeanOnContextHierarchyIntegrationTests.ChildConfig.class) }) class SpyBeanOnContextHierarchyIntegrationTests { @Autowired @@ -54,22 +50,30 @@ class SpyBeanOnContextHierarchyIntegrationTests { void testSpying() { ApplicationContext context = this.childConfig.getContext(); ApplicationContext parentContext = context.getParent(); - assertThat(parentContext.getBeanNamesForType(ExampleService.class)).hasSize(1); - assertThat(parentContext.getBeanNamesForType(ExampleServiceCaller.class)).isEmpty(); - assertThat(context.getBeanNamesForType(ExampleService.class)).isEmpty(); - assertThat(context.getBeanNamesForType(ExampleServiceCaller.class)).hasSize(1); - assertThat(context.getBean(ExampleService.class)).isNotNull(); - assertThat(context.getBean(ExampleServiceCaller.class)).isNotNull(); + assertThat(parentContext + .getBeanNamesForType(org.springframework.boot.test.mock.mockito.example.ExampleService.class)).hasSize(1); + assertThat(parentContext + .getBeanNamesForType(org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller.class)) + .isEmpty(); + assertThat(context.getBeanNamesForType(org.springframework.boot.test.mock.mockito.example.ExampleService.class)) + .isEmpty(); + assertThat(context + .getBeanNamesForType(org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller.class)) + .hasSize(1); + assertThat(context.getBean(org.springframework.boot.test.mock.mockito.example.ExampleService.class)) + .isNotNull(); + assertThat(context.getBean(org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller.class)) + .isNotNull(); } @Configuration(proxyBeanMethods = false) - @SpyBean(SimpleExampleService.class) + @SpyBean(org.springframework.boot.test.mock.mockito.example.SimpleExampleService.class) static class ParentConfig { } @Configuration(proxyBeanMethods = false) - @SpyBean(ExampleServiceCaller.class) + @SpyBean(org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller.class) static class ChildConfig implements ApplicationContextAware { private ApplicationContext context; diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForExistingBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForExistingBeanIntegrationTests.java index b5788c9fdad..c3db640893a 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForExistingBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForExistingBeanIntegrationTests.java @@ -33,6 +33,7 @@ import static org.mockito.BDDMockito.then; * Test {@link SpyBean @SpyBean} on a test class can be used to replace existing beans. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForNewBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForNewBeanIntegrationTests.java index 932e7aca467..90bc40ea704 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForNewBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForNewBeanIntegrationTests.java @@ -33,6 +33,7 @@ import static org.mockito.BDDMockito.then; * Test {@link SpyBean @SpyBean} on a test class can be used to inject new spy instances. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests.java index 90f1cee1b00..77139b36808 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests.java @@ -36,6 +36,7 @@ import static org.mockito.BDDMockito.then; * * @author Phillip Webb * @see SpyBeanOnTestFieldForExistingBeanIntegrationTests + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanConfig.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanConfig.java index e643e5b0ad7..384fb4fb26a 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanConfig.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanConfig.java @@ -27,6 +27,7 @@ import org.springframework.context.annotation.Import; * config to trigger caching. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanIntegrationTests.java index 24e7203347f..a1a0050986c 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.then; * * @author Phillip Webb * @see SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java index 7085097889c..ce3de45b705 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java @@ -38,6 +38,7 @@ import static org.mockito.BDDMockito.then; * bean while preserving qualifiers. * * @author Andreas Neiser + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingCircularBeansIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingCircularBeansIntegrationTests.java index 89a0a358738..2a933eada63 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingCircularBeansIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingCircularBeansIntegrationTests.java @@ -20,7 +20,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.SpyBeanOnTestFieldForExistingCircularBeansIntegrationTests.SpyBeanOnTestFieldForExistingCircularBeansConfig; import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -32,11 +31,13 @@ import static org.mockito.BDDMockito.then; * beans with circular dependencies. * * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) @ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = SpyBeanOnTestFieldForExistingCircularBeansConfig.class) +@ContextConfiguration( + classes = SpyBeanOnTestFieldForExistingCircularBeansIntegrationTests.SpyBeanOnTestFieldForExistingCircularBeansConfig.class) class SpyBeanOnTestFieldForExistingCircularBeansIntegrationTests { @SpyBean diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanIntegrationTests.java index d6beab94be9..48a4b244abf 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanIntegrationTests.java @@ -38,6 +38,7 @@ import static org.mockito.BDDMockito.then; * * @author Phillip Webb * @see SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanProducedByFactoryBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanProducedByFactoryBeanIntegrationTests.java index 0a2bfbb1244..338465332a0 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanProducedByFactoryBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanProducedByFactoryBeanIntegrationTests.java @@ -39,6 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; * bean with generics that's produced by a factory bean. * * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForMultipleExistingBeansWithOnePrimaryIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForMultipleExistingBeansWithOnePrimaryIntegrationTests.java index 69576871c37..538925c6f23 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForMultipleExistingBeansWithOnePrimaryIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForMultipleExistingBeansWithOnePrimaryIntegrationTests.java @@ -37,6 +37,7 @@ import static org.mockito.BDDMockito.then; * instance when there are multiple candidates and one is primary. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForNewBeanIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForNewBeanIntegrationTests.java index aded79bb392..f1c2f51df38 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForNewBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForNewBeanIntegrationTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.then; * instances. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyAndNotProxyTargetAwareTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyAndNotProxyTargetAwareTests.java index 59cb4853f8a..aaaee7f7ac4 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyAndNotProxyTargetAwareTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyAndNotProxyTargetAwareTests.java @@ -43,6 +43,7 @@ import static org.mockito.Mockito.reset; * * @author Phillip Webb * @see 5837 + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyTests.java index 61a21f11eb9..edeb01bdf4f 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyTests.java @@ -43,6 +43,7 @@ import static org.mockito.BDDMockito.then; * * @author Phillip Webb * @see 5837 + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java index 25338d2c4cf..ca495fcbc21 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java @@ -35,6 +35,7 @@ import static org.mockito.BDDMockito.then; * {@link DirtiesContext @DirtiesContext} and {@link ClassMode#BEFORE_EACH_TEST_METHOD}. * * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithJdkProxyTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithJdkProxyTests.java index 0a8965284c5..62a3c2874f7 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithJdkProxyTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithJdkProxyTests.java @@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.then; * Tests for {@link SpyBean @SpyBean} with a JDK proxy. * * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java index 11d4c2fc094..518b2ac8369 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java @@ -34,6 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Phillip Webb * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyDefinitionTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyDefinitionTests.java index ed6d37fe01e..8f5cea4d6f0 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyDefinitionTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyDefinitionTests.java @@ -34,6 +34,7 @@ import static org.mockito.Mockito.mock; * Tests for {@link SpyDefinition}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifier.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifier.java index 559edfb3398..9308e6940e3 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifier.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifier.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Qualifier; * Custom qualifier for testing. * * @author Stephane Nicoll + * @deprecated since 3.4.0 for removal in 3.6.0 */ @Deprecated(since = "3.4.0", forRemoval = true) @Qualifier diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifierExampleService.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifierExampleService.java index 41bc34e99f2..d2505f0f198 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifierExampleService.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifierExampleService.java @@ -20,6 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; * An {@link ExampleService} that uses a custom qualifier. * * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleExtraInterface.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleExtraInterface.java index d2b79b801c0..e2577ae2850 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleExtraInterface.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleExtraInterface.java @@ -20,6 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; * Example extra interface for mocking tests. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @Deprecated(since = "3.4.0", forRemoval = true) public interface ExampleExtraInterface { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericService.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericService.java index 7756de05085..5f9efa1b2d0 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericService.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericService.java @@ -21,6 +21,7 @@ package org.springframework.boot.test.mock.mockito.example; * * @param the generic type * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @Deprecated(since = "3.4.0", forRemoval = true) public interface ExampleGenericService { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericServiceCaller.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericServiceCaller.java index 0b77f522a07..9a1c396c13e 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericServiceCaller.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericServiceCaller.java @@ -20,6 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; * Example bean for mocking tests that calls {@link ExampleGenericService}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericStringServiceCaller.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericStringServiceCaller.java index 4c24f21d5ba..859d3e1a2e1 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericStringServiceCaller.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericStringServiceCaller.java @@ -20,6 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; * Example bean for mocking tests that calls {@link ExampleGenericService}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleService.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleService.java index 06c653ce391..15089baeda0 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleService.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleService.java @@ -20,6 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; * Example service interface for mocking tests. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @Deprecated(since = "3.4.0", forRemoval = true) public interface ExampleService { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleServiceCaller.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleServiceCaller.java index ad3816f240b..36b3b06b8a8 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleServiceCaller.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleServiceCaller.java @@ -20,6 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; * Example bean for mocking tests that calls {@link ExampleService}. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/FailingExampleService.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/FailingExampleService.java index 98307be8c20..9a96c3565e2 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/FailingExampleService.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/FailingExampleService.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; * An {@link ExampleService} that always throws an exception. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/RealExampleService.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/RealExampleService.java index dd5e42da963..56d3674c035 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/RealExampleService.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/RealExampleService.java @@ -20,6 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; * Example service implementation for spy tests. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleIntegerGenericService.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleIntegerGenericService.java index b7a8c480b76..0aa5b9e359b 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleIntegerGenericService.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleIntegerGenericService.java @@ -20,6 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; * Example generic service implementation for spy tests. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleService.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleService.java index 20426aceb83..4ddb53e601b 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleService.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleService.java @@ -20,6 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; * Example service implementation for spy tests. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleStringGenericService.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleStringGenericService.java index 417f7f020b3..a89b6cb1c67 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleStringGenericService.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/SimpleExampleStringGenericService.java @@ -20,6 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; * Example generic service implementation for spy tests. * * @author Phillip Webb + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true) 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-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/web/client/ClientHttpRequestFactories.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java index 033b2c21e0b..4fc33b705c9 100644 --- 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 @@ public final class ClientHttpRequestFactories { /** * 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/json/JsonWriterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/JsonWriterTests.java index 03cef07b568..c4d0287d1bc 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/JsonWriterTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/JsonWriterTests.java @@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; * @author Moritz Halbritter * @author Phillip Webb */ -public class JsonWriterTests { +class JsonWriterTests { private static final Person PERSON = new Person("Spring", "Boot", 10); 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 index 247d5025977..18922828855 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThat; * 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 { 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-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 { diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/SpyBeanSampleDataJpaApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/SpyBeanSampleDataJpaApplicationTests.java index 7b3e2b14c2b..8b944b59c4f 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/SpyBeanSampleDataJpaApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/SpyBeanSampleDataJpaApplicationTests.java @@ -33,6 +33,7 @@ import static org.mockito.BDDMockito.then; * Tests for {@link SampleDataJpaApplication} that use {@link SpyBean @SpyBean}. * * @author Andy Wilkinson + * @deprecated since 3.4.0 for removal in 3.6.0 */ @SuppressWarnings("removal") @Deprecated(since = "3.4.0", forRemoval = true)