GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch '3.3.x' into 3.4.x 

Closes gh-44992
pull/44982/head
Phillip Webb 9 months ago
parent
d0612f5e0e f2d367a130
commit
c96835bc9d
130 changed files with 137 additions and 137 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscoverer.java
  2. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/EndpointExposure.java
  3. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConnectionDetails.java
  4. 2
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractExposableEndpoint.java
  5. 2
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ExposableEndpoint.java
  6. 2
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/AbstractDiscoveredEndpoint.java
  7. 2
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/Endpoint.java
  8. 4
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java
  9. 2
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpoint.java
  10. 2
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscoverer.java
  11. 2
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpoint.java
  12. 2
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscoverer.java
  13. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
  14. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
  15. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessor.java
  16. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessorTests.java
  17. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java
  18. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java
  19. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java
  20. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java
  21. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBeans.java
  22. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java
  23. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java
  24. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizer.java
  25. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactory.java
  26. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java
  27. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java
  28. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java
  29. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java
  30. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolver.java
  31. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBean.java
  32. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBeans.java
  33. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java
  34. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/package-info.java
  35. 2
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
  36. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericExtensionTests.java
  37. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericTests.java
  38. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java
  39. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanContextCachingTests.java
  40. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanForBeanFactoryIntegrationTests.java
  41. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForExistingBeanIntegrationTests.java
  42. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForNewBeanIntegrationTests.java
  43. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForExistingBeanIntegrationTests.java
  44. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForNewBeanIntegrationTests.java
  45. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnContextHierarchyIntegrationTests.java
  46. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnScopedProxyTests.java
  47. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForExistingBeanIntegrationTests.java
  48. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForNewBeanIntegrationTests.java
  49. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanCacheIntegrationTests.java
  50. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanConfig.java
  51. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanIntegrationTests.java
  52. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java
  53. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForNewBeanIntegrationTests.java
  54. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAopProxyTests.java
  55. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java
  56. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java
  57. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithGenericsOnTestFieldForNewBeanIntegrationTests.java
  58. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithInjectedFieldIntegrationTests.java
  59. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithSpringMethodRuleRepeatJUnit4IntegrationTests.java
  60. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockDefinitionTests.java
  61. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockResetTests.java
  62. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactoryTests.java
  63. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerTests.java
  64. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java
  65. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerIntegrationTests.java
  66. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java
  67. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/QualifierDefinitionTests.java
  68. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java
  69. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverTests.java
  70. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForExistingBeanIntegrationTests.java
  71. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForNewBeanIntegrationTests.java
  72. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForExistingBeanIntegrationTests.java
  73. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForNewBeanIntegrationTests.java
  74. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnContextHierarchyIntegrationTests.java
  75. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForExistingBeanIntegrationTests.java
  76. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForNewBeanIntegrationTests.java
  77. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests.java
  78. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanConfig.java
  79. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanIntegrationTests.java
  80. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java
  81. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingCircularBeansIntegrationTests.java
  82. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanIntegrationTests.java
  83. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanProducedByFactoryBeanIntegrationTests.java
  84. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForMultipleExistingBeansWithOnePrimaryIntegrationTests.java
  85. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForNewBeanIntegrationTests.java
  86. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyAndNotProxyTargetAwareTests.java
  87. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyTests.java
  88. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java
  89. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithJdkProxyTests.java
  90. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java
  91. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyDefinitionTests.java
  92. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifier.java
  93. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifierExampleService.java
  94. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleExtraInterface.java
  95. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericService.java
  96. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericServiceCaller.java
  97. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericStringServiceCaller.java
  98. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleService.java
  99. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleServiceCaller.java
  100. 2
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/FailingExampleService.java
  101. Some files were not shown because too many files have changed in this diff Show More

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscoverer.java
Unescape View File

@ -57,7 +57,7 @@ public class CloudFoundryWebEndpointDiscoverer extends WebEndpointDiscoverer { @@ -57,7 +57,7 @@ public class CloudFoundryWebEndpointDiscoverer extends WebEndpointDiscoverer {
* @param endpointPathMappers the endpoint path mappers
* @param invokerAdvisors invoker advisors to apply
* @param endpointFilters endpoint filters to apply
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #CloudFoundryWebEndpointDiscoverer(ApplicationContext, ParameterValueMapper, EndpointMediaTypes, List, Collection, Collection, Collection)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/EndpointExposure.java
Unescape View File

@ -37,7 +37,7 @@ public enum EndpointExposure { @@ -37,7 +37,7 @@ public enum EndpointExposure {
/**
* Exposed on Cloud Foundry over `/cloudfoundryapplication`.
* @since 2.6.4
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of using
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of using
* {@link EndpointExposure#WEB}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConnectionDetails.java
Unescape View File

@ -30,7 +30,7 @@ public interface OtlpTracingConnectionDetails extends ConnectionDetails { @@ -30,7 +30,7 @@ public interface OtlpTracingConnectionDetails extends ConnectionDetails {
/**
* Address to where tracing will be published.
* @return the address to where tracing will be published
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of {@link #getUrl(Transport)}
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of {@link #getUrl(Transport)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)
default String getUrl() {

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractExposableEndpoint.java
Unescape View File

@ -41,7 +41,7 @@ public abstract class AbstractExposableEndpoint<O extends Operation> implements @@ -41,7 +41,7 @@ public abstract class AbstractExposableEndpoint<O extends Operation> implements
* @param id the endpoint id
* @param enabledByDefault if the endpoint is enabled by default
* @param operations the endpoint operations
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #AbstractExposableEndpoint(EndpointId, Access, Collection)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ExposableEndpoint.java
Unescape View File

@ -37,7 +37,7 @@ public interface ExposableEndpoint<O extends Operation> { @@ -37,7 +37,7 @@ public interface ExposableEndpoint<O extends Operation> {
/**
* Returns if the endpoint is enabled by default.
* @return if the endpoint is enabled by default
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #getDefaultAccess()}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/AbstractDiscoveredEndpoint.java
Unescape View File

@ -48,7 +48,7 @@ public abstract class AbstractDiscoveredEndpoint<O extends Operation> extends Ab @@ -48,7 +48,7 @@ public abstract class AbstractDiscoveredEndpoint<O extends Operation> extends Ab
* @param id the ID of the endpoint
* @param enabledByDefault if the endpoint is enabled by default
* @param operations the endpoint operations
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #AbstractDiscoveredEndpoint(EndpointDiscoverer, Object, EndpointId, Access, Collection)}
*/
@SuppressWarnings("removal")

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/Endpoint.java
Unescape View File

@ -66,7 +66,7 @@ public @interface Endpoint { @@ -66,7 +66,7 @@ public @interface Endpoint {
/**
* If the endpoint should be enabled or disabled by default.
* @return {@code true} if the endpoint is enabled by default
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of {@link #defaultAccess()}
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of {@link #defaultAccess()}
*/
@Deprecated(since = "3.4.0", forRemoval = true)
boolean enableByDefault() default true;

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java
Unescape View File

@ -90,7 +90,7 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten @@ -90,7 +90,7 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
* @param parameterValueMapper the parameter value mapper
* @param invokerAdvisors invoker advisors to apply
* @param endpointFilters endpoint filters to apply
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #EndpointDiscoverer(ApplicationContext, ParameterValueMapper, Collection, Collection, Collection)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)
@ -388,7 +388,7 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten @@ -388,7 +388,7 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
* @param enabledByDefault if the endpoint is enabled by default
* @param operations the endpoint operations
* @return a created endpoint (a {@link DiscoveredEndpoint} is recommended)
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #createEndpoint(Object, EndpointId, Access, Collection)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpoint.java
Unescape View File

@ -51,7 +51,7 @@ public @interface JmxEndpoint { @@ -51,7 +51,7 @@ public @interface JmxEndpoint {
/**
* If the endpoint should be enabled or disabled by default.
* @return {@code true} if the endpoint is enabled by default
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
*/
@Deprecated(since = "3.4.0", forRemoval = true)
@AliasFor(annotation = Endpoint.class)

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscoverer.java
Unescape View File

@ -54,7 +54,7 @@ public class JmxEndpointDiscoverer extends EndpointDiscoverer<ExposableJmxEndpoi @@ -54,7 +54,7 @@ public class JmxEndpointDiscoverer extends EndpointDiscoverer<ExposableJmxEndpoi
* @param parameterValueMapper the parameter value mapper
* @param invokerAdvisors invoker advisors to apply
* @param endpointFilters endpoint filters to apply
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #JmxEndpointDiscoverer(ApplicationContext, ParameterValueMapper, Collection, Collection, Collection)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpoint.java
Unescape View File

@ -51,7 +51,7 @@ public @interface WebEndpoint { @@ -51,7 +51,7 @@ public @interface WebEndpoint {
/**
* If the endpoint should be enabled or disabled by default.
* @return {@code true} if the endpoint is enabled by default
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of {@link #defaultAccess()}
*/
@Deprecated(since = "3.4.0", forRemoval = true)
@AliasFor(annotation = Endpoint.class)

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscoverer.java
Unescape View File

@ -67,7 +67,7 @@ public class WebEndpointDiscoverer extends EndpointDiscoverer<ExposableWebEndpoi @@ -67,7 +67,7 @@ public class WebEndpointDiscoverer extends EndpointDiscoverer<ExposableWebEndpoi
* @param endpointPathMappers the endpoint path mappers
* @param invokerAdvisors invoker advisors to apply
* @param filters filters to apply
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #WebEndpointDiscoverer(ApplicationContext, ParameterValueMapper, EndpointMediaTypes, List, List, Collection, Collection, Collection)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
Unescape View File

@ -101,7 +101,7 @@ public final class DefaultJmsListenerContainerFactoryConfigurer { @@ -101,7 +101,7 @@ public final class DefaultJmsListenerContainerFactoryConfigurer {
* Set the {@link ObservationRegistry} to use.
* @param observationRegistry the {@link ObservationRegistry}
* @since 3.2.1
* @deprecated since 3.3.10 for removal in 3.6.0 as this should have been package
* @deprecated since 3.3.10 for removal in 4.0.0 as this should have been package
* private
*/
@Deprecated(since = "3.3.10", forRemoval = true)

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
Unescape View File

@ -159,7 +159,7 @@ public abstract class JpaBaseConfiguration { @@ -159,7 +159,7 @@ public abstract class JpaBaseConfiguration {
/**
* Return the vendor-specific properties.
* @return the vendor properties
* @deprecated since 3.4.4 for removal in 3.6.0 in favor of
* @deprecated since 3.4.4 for removal in 4.0.0 in favor of
* {@link #getVendorProperties(DataSource)}
*/
@Deprecated(since = "3.4.4", forRemoval = true)

2
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessor.java
Unescape View File

@ -29,7 +29,7 @@ import org.springframework.test.context.ApplicationContextFailureProcessor; @@ -29,7 +29,7 @@ import org.springframework.test.context.ApplicationContextFailureProcessor;
* @author Phillip Webb
* @author Scott Frederick
* @since 3.0.0
* @deprecated in 3.2.11 for removal in 3.6.0
* @deprecated in 3.2.11 for removal in 4.0.0
*/
@Deprecated(since = "3.2.11", forRemoval = true)
public class ConditionReportApplicationContextFailureProcessor implements ApplicationContextFailureProcessor {

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ConditionReportApplicationContextFailureProcessorTests.java
Unescape View File

@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Phillip Webb
* @author Scott Frederick
* @deprecated since 3.2.11 for removal in 3.6.0
* @deprecated since 3.2.11 for removal in 4.0.0
*/
@ExtendWith(OutputCaptureExtension.class)
@Deprecated(since = "3.2.11", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java
Unescape View File

@ -121,7 +121,7 @@ public abstract class AbstractApplicationContextRunner<SELF extends AbstractAppl @@ -121,7 +121,7 @@ public abstract class AbstractApplicationContextRunner<SELF extends AbstractAppl
* @param contextFactory the factory used to create the actual context
* @param instanceFactory the factory used to create new instance of the runner
* @since 2.6.0
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #AbstractApplicationContextRunner(Function, Supplier, Class...)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java
Unescape View File

@ -23,7 +23,7 @@ import org.springframework.util.ObjectUtils; @@ -23,7 +23,7 @@ import org.springframework.util.ObjectUtils;
*
* @author Phillip Webb
* @see DefinitionsParser
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java
Unescape View File

@ -41,7 +41,7 @@ import org.springframework.util.StringUtils; @@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
*
* @author Phillip Webb
* @author Stephane Nicoll
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java
Unescape View File

@ -91,7 +91,7 @@ import org.springframework.test.context.junit4.SpringRunner; @@ -91,7 +91,7 @@ import org.springframework.test.context.junit4.SpringRunner;
* @author Phillip Webb
* @since 1.4.0
* @see MockitoPostProcessor
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link org.springframework.test.context.bean.override.mockito.MockitoBean}
*/
@SuppressWarnings("removal")

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBeans.java
Unescape View File

@ -33,7 +33,7 @@ import java.lang.annotation.Target; @@ -33,7 +33,7 @@ import java.lang.annotation.Target;
*
* @author Phillip Webb
* @since 1.4.0
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link org.springframework.test.context.bean.override.mockito.MockitoBean}
*/
@SuppressWarnings("removal")

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java
Unescape View File

@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock; @@ -37,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java
Unescape View File

@ -35,7 +35,7 @@ import org.springframework.util.Assert; @@ -35,7 +35,7 @@ import org.springframework.util.Assert;
* @author Phillip Webb
* @since 1.4.0
* @see ResetMocksTestExecutionListener
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link org.springframework.test.context.bean.override.mockito.MockReset}
*/

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizer.java
Unescape View File

@ -28,7 +28,7 @@ import org.springframework.test.context.MergedContextConfiguration; @@ -28,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactory.java
Unescape View File

@ -27,7 +27,7 @@ import org.springframework.test.context.TestContextAnnotationUtils; @@ -27,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java
Unescape View File

@ -78,7 +78,7 @@ import org.springframework.util.StringUtils; @@ -78,7 +78,7 @@ import org.springframework.util.StringUtils;
* @author Stephane Nicoll
* @author Andreas Neiser
* @since 1.4.0
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of Spring Framework's
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of Spring Framework's
* {@link MockitoBean} and {@link MockitoSpyBean} support
*/
@SuppressWarnings("removal")

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java
Unescape View File

@ -48,7 +48,7 @@ import org.springframework.util.ReflectionUtils.FieldCallback; @@ -48,7 +48,7 @@ import org.springframework.util.ReflectionUtils.FieldCallback;
* @author Moritz Halbritter
* @since 1.4.2
* @see ResetMocksTestExecutionListener
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of Spring Framework's support for
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of Spring Framework's support for
* {@link MockitoBean} and {@link MockitoSpyBean}.
*/
@SuppressWarnings("removal")

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java
Unescape View File

@ -34,7 +34,7 @@ import org.springframework.core.annotation.MergedAnnotations; @@ -34,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java
Unescape View File

@ -43,7 +43,7 @@ import org.springframework.util.ClassUtils; @@ -43,7 +43,7 @@ import org.springframework.util.ClassUtils;
* @author Phillip Webb
* @since 1.4.0
* @see MockitoTestExecutionListener
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link org.springframework.test.context.bean.override.mockito.MockitoResetTestExecutionListener}
*/
@SuppressWarnings("removal")

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolver.java
Unescape View File

@ -31,7 +31,7 @@ import org.springframework.util.Assert; @@ -31,7 +31,7 @@ import org.springframework.util.Assert;
*
* @author Andy Wilkinson
* @since 2.4.0
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of Spring Framework's
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of Spring Framework's
* {@link MockitoBean} and {@link MockitoSpyBean}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBean.java
Unescape View File

@ -89,7 +89,7 @@ import org.springframework.test.context.junit4.SpringRunner; @@ -89,7 +89,7 @@ import org.springframework.test.context.junit4.SpringRunner;
* @author Phillip Webb
* @since 1.4.0
* @see MockitoPostProcessor
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link org.springframework.test.context.bean.override.mockito.MockitoSpyBean}
*/
@SuppressWarnings("removal")

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBeans.java
Unescape View File

@ -33,7 +33,7 @@ import java.lang.annotation.Target; @@ -33,7 +33,7 @@ import java.lang.annotation.Target;
*
* @author Phillip Webb
* @since 1.4.0
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link org.springframework.test.context.bean.override.mockito.MockitoSpyBean}
*/
@SuppressWarnings("removal")

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java
Unescape View File

@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock; @@ -37,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/package-info.java
Unescape View File

@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
/**
* Mockito integration for Spring Boot tests.
* <p>
* Deprecated since 3.4.0 for removal in 3.6.0 in favor of Spring Framework's
* Deprecated since 3.4.0 for removal in 4.0.0 in favor of Spring Framework's
* {@link org.springframework.test.context.bean.override.mockito.MockitoBean} and
* {@link org.springframework.test.context.bean.override.mockito.MockitoSpyBean}
*/

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
Unescape View File

@ -1060,7 +1060,7 @@ public class TestRestTemplate { @@ -1060,7 +1060,7 @@ public class TestRestTemplate {
* Create a new {@link CustomHttpComponentsClientHttpRequestFactory} instance.
* @param httpClientOptions the {@link HttpClient} options
* @param settings the settings to apply
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #CustomHttpComponentsClientHttpRequestFactory(HttpClientOption[], ClientHttpRequestFactorySettings)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericExtensionTests.java
Unescape View File

@ -20,7 +20,7 @@ package org.springframework.boot.test.mock.mockito; @@ -20,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericTests.java
Unescape View File

@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @param <T> type of thing
* @param <U> type of something
* @author Madhura Bhave
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java
Unescape View File

@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; @@ -36,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanContextCachingTests.java
Unescape View File

@ -42,7 +42,7 @@ import static org.mockito.Mockito.mock; @@ -42,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanForBeanFactoryIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock; @@ -34,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForExistingBeanIntegrationTests.java
Unescape View File

@ -35,7 +35,7 @@ import static org.mockito.BDDMockito.given; @@ -35,7 +35,7 @@ import static org.mockito.BDDMockito.given;
* existing beans.
*
* @author Phillip Webb
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationClassForNewBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given; @@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given;
* instances.
*
* @author Phillip Webb
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@ExtendWith(SpringExtension.class)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForExistingBeanIntegrationTests.java
Unescape View File

@ -35,7 +35,7 @@ import static org.mockito.BDDMockito.given; @@ -35,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@ExtendWith(SpringExtension.class)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnConfigurationFieldForNewBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given; @@ -34,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@ExtendWith(SpringExtension.class)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnContextHierarchyIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -34,7 +34,7 @@ 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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnScopedProxyTests.java
Unescape View File

@ -38,7 +38,7 @@ import static org.mockito.BDDMockito.given; @@ -38,7 +38,7 @@ import static org.mockito.BDDMockito.given;
*
* @author Phillip Webb
* @see <a href="https://github.com/spring-projects/spring-boot/issues/5724">gh-5724</a>
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForExistingBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given; @@ -34,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestClassForNewBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given; @@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given;
* instances.
*
* @author Phillip Webb
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanCacheIntegrationTests.java
Unescape View File

@ -36,7 +36,7 @@ import static org.mockito.BDDMockito.given; @@ -36,7 +36,7 @@ import static org.mockito.BDDMockito.given;
*
* @author Phillip Webb
* @see MockBeanOnTestFieldForExistingBeanIntegrationTests
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanConfig.java
Unescape View File

@ -27,7 +27,7 @@ import org.springframework.context.annotation.Import; @@ -27,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given; @@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given;
*
* @author Phillip Webb
* @see MockBeanOnTestFieldForExistingBeanCacheIntegrationTests
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java
Unescape View File

@ -39,7 +39,7 @@ import static org.mockito.BDDMockito.then; @@ -39,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanOnTestFieldForNewBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given; @@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given;
* instances.
*
* @author Phillip Webb
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAopProxyTests.java
Unescape View File

@ -45,7 +45,7 @@ import static org.mockito.Mockito.times; @@ -45,7 +45,7 @@ import static org.mockito.Mockito.times;
*
* @author Phillip Webb
* @see <a href="https://github.com/spring-projects/spring-boot/issues/5837">5837</a>
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java
Unescape View File

@ -33,7 +33,7 @@ import static org.mockito.BDDMockito.given; @@ -33,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java
Unescape View File

@ -36,7 +36,7 @@ import static org.mockito.BDDMockito.given; @@ -36,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithGenericsOnTestFieldForNewBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given; @@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.given;
* instances.
*
* @author Phillip Webb
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithInjectedFieldIntegrationTests.java
Unescape View File

@ -31,7 +31,7 @@ import static org.mockito.BDDMockito.given; @@ -31,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithSpringMethodRuleRepeatJUnit4IntegrationTests.java
Unescape View File

@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Andy Wilkinson
* @see <a href="https://github.com/spring-projects/spring-boot/issues/27693">gh-27693</a>
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockDefinitionTests.java
Unescape View File

@ -33,7 +33,7 @@ import static org.mockito.Mockito.mock; @@ -33,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockResetTests.java
Unescape View File

@ -28,7 +28,7 @@ import static org.mockito.Mockito.withSettings; @@ -28,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerFactoryTests.java
Unescape View File

@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -26,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerTests.java
Unescape View File

@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -33,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java
Unescape View File

@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; @@ -50,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerIntegrationTests.java
Unescape View File

@ -49,7 +49,7 @@ import static org.mockito.BDDMockito.given; @@ -49,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java
Unescape View File

@ -41,7 +41,7 @@ import static org.mockito.Mockito.mock; @@ -41,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/QualifierDefinitionTests.java
Unescape View File

@ -40,7 +40,7 @@ import static org.mockito.BDDMockito.then; @@ -40,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java
Unescape View File

@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; @@ -39,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverTests.java
Unescape View File

@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -29,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForExistingBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.then; @@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.then;
* beans.
*
* @author Phillip Webb
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationClassForNewBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.then; @@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.then;
* instances.
*
* @author Phillip Webb
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForExistingBeanIntegrationTests.java
Unescape View File

@ -35,7 +35,7 @@ import static org.mockito.BDDMockito.then; @@ -35,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnConfigurationFieldForNewBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.then; @@ -34,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnContextHierarchyIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -34,7 +34,7 @@ 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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForExistingBeanIntegrationTests.java
Unescape View File

@ -33,7 +33,7 @@ import static org.mockito.BDDMockito.then; @@ -33,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestClassForNewBeanIntegrationTests.java
Unescape View File

@ -33,7 +33,7 @@ import static org.mockito.BDDMockito.then; @@ -33,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests.java
Unescape View File

@ -36,7 +36,7 @@ import static org.mockito.BDDMockito.then; @@ -36,7 +36,7 @@ import static org.mockito.BDDMockito.then;
*
* @author Phillip Webb
* @see SpyBeanOnTestFieldForExistingBeanIntegrationTests
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanConfig.java
Unescape View File

@ -27,7 +27,7 @@ import org.springframework.context.annotation.Import; @@ -27,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.then; @@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.then;
*
* @author Phillip Webb
* @see SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanWithQualifierIntegrationTests.java
Unescape View File

@ -38,7 +38,7 @@ import static org.mockito.BDDMockito.then; @@ -38,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingCircularBeansIntegrationTests.java
Unescape View File

@ -31,7 +31,7 @@ import static org.mockito.BDDMockito.then; @@ -31,7 +31,7 @@ import static org.mockito.BDDMockito.then;
* beans with circular dependencies.
*
* @author Andy Wilkinson
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanIntegrationTests.java
Unescape View File

@ -38,7 +38,7 @@ import static org.mockito.BDDMockito.then; @@ -38,7 +38,7 @@ import static org.mockito.BDDMockito.then;
*
* @author Phillip Webb
* @see SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingGenericBeanProducedByFactoryBeanIntegrationTests.java
Unescape View File

@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -39,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForMultipleExistingBeansWithOnePrimaryIntegrationTests.java
Unescape View File

@ -37,7 +37,7 @@ import static org.mockito.BDDMockito.then; @@ -37,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForNewBeanIntegrationTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.then; @@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.then;
* instances.
*
* @author Phillip Webb
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyAndNotProxyTargetAwareTests.java
Unescape View File

@ -43,7 +43,7 @@ import static org.mockito.Mockito.reset; @@ -43,7 +43,7 @@ import static org.mockito.Mockito.reset;
*
* @author Phillip Webb
* @see <a href="https://github.com/spring-projects/spring-boot/issues/5837">5837</a>
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyTests.java
Unescape View File

@ -43,7 +43,7 @@ import static org.mockito.BDDMockito.then; @@ -43,7 +43,7 @@ import static org.mockito.BDDMockito.then;
*
* @author Phillip Webb
* @see <a href="https://github.com/spring-projects/spring-boot/issues/5837">5837</a>
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java
Unescape View File

@ -35,7 +35,7 @@ import static org.mockito.BDDMockito.then; @@ -35,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithJdkProxyTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.then; @@ -34,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -34,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyDefinitionTests.java
Unescape View File

@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock; @@ -34,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifier.java
Unescape View File

@ -25,7 +25,7 @@ import org.springframework.beans.factory.annotation.Qualifier; @@ -25,7 +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 for removal in 4.0.0
*/
@Deprecated(since = "3.4.0", forRemoval = true)
@Qualifier

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/CustomQualifierExampleService.java
Unescape View File

@ -20,7 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; @@ -20,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleExtraInterface.java
Unescape View File

@ -20,7 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; @@ -20,7 +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 for removal in 4.0.0
*/
@Deprecated(since = "3.4.0", forRemoval = true)
public interface ExampleExtraInterface {

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericService.java
Unescape View File

@ -21,7 +21,7 @@ package org.springframework.boot.test.mock.mockito.example; @@ -21,7 +21,7 @@ package org.springframework.boot.test.mock.mockito.example;
*
* @param <T> the generic type
* @author Phillip Webb
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@Deprecated(since = "3.4.0", forRemoval = true)
public interface ExampleGenericService<T> {

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericServiceCaller.java
Unescape View File

@ -20,7 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; @@ -20,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericStringServiceCaller.java
Unescape View File

@ -20,7 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; @@ -20,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleService.java
Unescape View File

@ -20,7 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; @@ -20,7 +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 for removal in 4.0.0
*/
@Deprecated(since = "3.4.0", forRemoval = true)
public interface ExampleService {

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleServiceCaller.java
Unescape View File

@ -20,7 +20,7 @@ package org.springframework.boot.test.mock.mockito.example; @@ -20,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/FailingExampleService.java
Unescape View File

@ -22,7 +22,7 @@ import org.springframework.stereotype.Service; @@ -22,7 +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
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save