Relocate bean override infrastructure to the proper package in the TCF

spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverride.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideBeanPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;

spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.util.List;
 import java.util.Set;

spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideParser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;

spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;

spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideStrategy.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 /**
  * Strategies for bean override instantiation, implemented in

spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.lang.reflect.Field;
 import java.util.function.BiConsumer;

spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;

spring-test/src/main/java/org/springframework/test/context/bean/override/convention/TestBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.convention;
+package org.springframework.test.context.bean.override.convention;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -22,7 +22,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.test.bean.override.BeanOverride;
+import org.springframework.test.context.bean.override.BeanOverride;
 
 /**
  * Mark a field to override a bean instance in the {@code BeanFactory}.
@@ -109,4 +109,5 @@ public @interface TestBean {
 	 * annotated field.
 	 */
 	String name() default "";
+
 }

spring-test/src/main/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.convention;
+package org.springframework.test.context.bean.override.convention;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -29,9 +29,9 @@ import java.util.Set;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.core.ResolvableType;
 import org.springframework.lang.Nullable;
-import org.springframework.test.bean.override.BeanOverrideProcessor;
-import org.springframework.test.bean.override.BeanOverrideStrategy;
-import org.springframework.test.bean.override.OverrideMetadata;
+import org.springframework.test.context.bean.override.BeanOverrideProcessor;
+import org.springframework.test.context.bean.override.BeanOverrideStrategy;
+import org.springframework.test.context.bean.override.OverrideMetadata;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

spring-test/src/main/java/org/springframework/test/context/bean/override/convention/package-info.java

@@ -5,7 +5,7 @@
  */
 @NonNullApi
 @NonNullFields
-package org.springframework.test.bean.override.convention;
+package org.springframework.test.context.bean.override.convention;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/Definition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -23,8 +23,8 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.SingletonBeanRegistry;
 import org.springframework.core.ResolvableType;
 import org.springframework.lang.Nullable;
-import org.springframework.test.bean.override.BeanOverrideStrategy;
-import org.springframework.test.bean.override.OverrideMetadata;
+import org.springframework.test.context.bean.override.BeanOverrideStrategy;
+import org.springframework.test.context.bean.override.OverrideMetadata;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockDefinition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.lang.Nullable;
-import org.springframework.test.bean.override.BeanOverrideStrategy;
+import org.springframework.test.context.bean.override.BeanOverrideStrategy;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockReset.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito;
 
 import java.util.List;
 

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
 import org.mockito.Answers;
 import org.mockito.MockSettings;
 
-import org.springframework.test.bean.override.BeanOverride;
+import org.springframework.test.context.bean.override.BeanOverride;
 
 /**
  * Mark a field to trigger a bean override using a Mockito mock. If no explicit

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessor.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 
 import org.springframework.core.ResolvableType;
-import org.springframework.test.bean.override.BeanOverrideProcessor;
-import org.springframework.test.bean.override.OverrideMetadata;
+import org.springframework.test.context.bean.override.BeanOverrideProcessor;
+import org.springframework.test.context.bean.override.OverrideMetadata;
 
 /**
  * A {@link BeanOverrideProcessor} for mockito-related annotations

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeans.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito;
 
 import java.util.ArrayList;
 import java.util.Iterator;

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito;
 
 import java.util.Arrays;
 import java.util.HashSet;

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
 
 import org.mockito.Mockito;
 
-import org.springframework.test.bean.override.BeanOverride;
+import org.springframework.test.context.bean.override.BeanOverride;
 
 /**
  * Mark a field to trigger a bean override using a Mockito spy, which will wrap

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoTestExecutionListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/SpyDefinition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.lang.Nullable;
-import org.springframework.test.bean.override.BeanOverrideStrategy;
+import org.springframework.test.context.bean.override.BeanOverrideStrategy;
 import org.springframework.test.util.AopTestUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/package-info.java

@@ -3,7 +3,7 @@
  */
 @NonNullApi
 @NonNullFields
-package org.springframework.test.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;

spring-test/src/main/java/org/springframework/test/context/bean/override/package-info.java

@@ -3,7 +3,7 @@
  */
 @NonNullApi
 @NonNullFields
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;

spring-test/src/main/resources/META-INF/spring.factories

@@ -1,22 +1,22 @@
 # Default TestExecutionListeners for the Spring TestContext Framework
 #
 org.springframework.test.context.TestExecutionListener = \
-	org.springframework.test.bean.override.BeanOverrideTestExecutionListener,\
-	org.springframework.test.bean.override.mockito.MockitoTestExecutionListener,\
-	org.springframework.test.bean.override.mockito.MockitoResetTestExecutionListener,\
 	org.springframework.test.context.web.ServletTestExecutionListener,\
 	org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener,\
 	org.springframework.test.context.event.ApplicationEventsTestExecutionListener,\
+	org.springframework.test.context.bean.override.mockito.MockitoTestExecutionListener,\
 	org.springframework.test.context.support.DependencyInjectionTestExecutionListener,\
 	org.springframework.test.context.observation.MicrometerObservationRegistryTestExecutionListener,\
 	org.springframework.test.context.support.DirtiesContextTestExecutionListener,\
 	org.springframework.test.context.transaction.TransactionalTestExecutionListener,\
 	org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener,\
-	org.springframework.test.context.event.EventPublishingTestExecutionListener
+	org.springframework.test.context.event.EventPublishingTestExecutionListener,\
+	org.springframework.test.context.bean.override.mockito.MockitoResetTestExecutionListener,\
+	org.springframework.test.context.bean.override.BeanOverrideTestExecutionListener
 
 # Default ContextCustomizerFactory implementations for the Spring TestContext Framework
 #
 org.springframework.test.context.ContextCustomizerFactory = \
-	org.springframework.test.bean.override.BeanOverrideContextCustomizerFactory,\
+	org.springframework.test.context.bean.override.BeanOverrideContextCustomizerFactory,\
 	org.springframework.test.context.web.socket.MockServerContainerContextCustomizerFactory,\
 	org.springframework.test.context.support.DynamicPropertiesContextCustomizerFactory

spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java

@@ -25,9 +25,9 @@ import org.junit.jupiter.api.Test;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.annotation.AnnotationConfigurationException;
-import org.springframework.test.bean.override.BeanOverrideTestExecutionListener;
-import org.springframework.test.bean.override.mockito.MockitoResetTestExecutionListener;
-import org.springframework.test.bean.override.mockito.MockitoTestExecutionListener;
+import org.springframework.test.context.bean.override.BeanOverrideTestExecutionListener;
+import org.springframework.test.context.bean.override.mockito.MockitoResetTestExecutionListener;
+import org.springframework.test.context.bean.override.mockito.MockitoTestExecutionListener;
 import org.springframework.test.context.event.ApplicationEventsTestExecutionListener;
 import org.springframework.test.context.event.EventPublishingTestExecutionListener;
 import org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener;

spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideBeanPostProcessorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.util.Map;
 import java.util.function.Predicate;
@@ -34,10 +34,10 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.SimpleThreadScope;
 import org.springframework.core.Ordered;
 import org.springframework.core.ResolvableType;
-import org.springframework.test.bean.override.example.ExampleBeanOverrideAnnotation;
-import org.springframework.test.bean.override.example.ExampleService;
-import org.springframework.test.bean.override.example.FailingExampleService;
-import org.springframework.test.bean.override.example.RealExampleService;
+import org.springframework.test.context.bean.override.example.ExampleBeanOverrideAnnotation;
+import org.springframework.test.context.bean.override.example.ExampleService;
+import org.springframework.test.context.bean.override.example.FailingExampleService;
+import org.springframework.test.context.bean.override.example.RealExampleService;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.Assert;
 

spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideParserTests.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.lang.reflect.Field;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.test.bean.override.example.ExampleBeanOverrideAnnotation;
-import org.springframework.test.bean.override.example.TestBeanOverrideMetaAnnotation;
+import org.springframework.test.context.bean.override.example.ExampleBeanOverrideAnnotation;
+import org.springframework.test.context.bean.override.example.TestBeanOverrideMetaAnnotation;
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatRuntimeException;
-import static org.springframework.test.bean.override.example.ExampleBeanOverrideProcessor.DUPLICATE_TRIGGER;
+import static org.springframework.test.context.bean.override.example.ExampleBeanOverrideProcessor.DUPLICATE_TRIGGER;
 
 /**
  * Unit tests for {@link BeanOverrideParser}.

spring-test/src/test/java/org/springframework/test/context/bean/override/OverrideMetadataTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override;
+package org.springframework.test.context.bean.override;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;

spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.convention;
+package org.springframework.test.context.bean.override.convention;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -25,8 +25,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.test.bean.override.example.ExampleService;
-import org.springframework.test.bean.override.example.FailingExampleService;
+import org.springframework.test.context.bean.override.example.ExampleService;
+import org.springframework.test.context.bean.override.example.FailingExampleService;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatException;

spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleBeanOverrideAnnotation.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.test.bean.override.BeanOverride;
+import org.springframework.test.context.bean.override.BeanOverride;
 
 @BeanOverride(ExampleBeanOverrideProcessor.class)
 @Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})

spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleBeanOverrideProcessor.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 
 import org.springframework.core.ResolvableType;
-import org.springframework.test.bean.override.BeanOverrideProcessor;
-import org.springframework.test.bean.override.OverrideMetadata;
+import org.springframework.test.context.bean.override.BeanOverrideProcessor;
+import org.springframework.test.context.bean.override.OverrideMetadata;
 
 public class ExampleBeanOverrideProcessor implements BeanOverrideProcessor {
 

spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 /**
  * Example service interface for mocking tests.

spring-test/src/test/java/org/springframework/test/context/bean/override/example/FailingExampleService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 import org.springframework.stereotype.Service;
 

spring-test/src/test/java/org/springframework/test/context/bean/override/example/RealExampleService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 /**
  * Example service implementation for spy tests.

spring-test/src/test/java/org/springframework/test/context/bean/override/example/TestBeanOverrideMetaAnnotation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-test/src/test/java/org/springframework/test/context/bean/override/example/TestOverrideMetadata.java

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
+
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
@@ -25,11 +26,11 @@ import java.lang.reflect.Modifier;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.core.ResolvableType;
 import org.springframework.lang.Nullable;
-import org.springframework.test.bean.override.BeanOverrideStrategy;
-import org.springframework.test.bean.override.OverrideMetadata;
+import org.springframework.test.context.bean.override.BeanOverrideStrategy;
+import org.springframework.test.context.bean.override.OverrideMetadata;
 import org.springframework.util.StringUtils;
 
-import static org.springframework.test.bean.override.example.ExampleBeanOverrideAnnotation.DEFAULT_VALUE;
+import static org.springframework.test.context.bean.override.example.ExampleBeanOverrideAnnotation.DEFAULT_VALUE;
 
 public class TestOverrideMetadata extends OverrideMetadata {
 

spring-test/src/test/java/org/springframework/test/context/bean/override/example/package-info.java

@@ -3,7 +3,7 @@
  */
 @NonNullApi
 @NonNullFields
-package org.springframework.test.bean.override.example;
+package org.springframework.test.context.bean.override.example;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;