Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove extra "Bean" from TestBeanBeanOverrideHandler class name

Browse Source 
The extra "Bean" was accidentally added in commit ebdf6dc2fc.

See gh-33702
This commit is contained in:
Sam Brannen
2024-11-01 14:57:30 +01:00
parent 86784b61cc
commit 97f23dca22
5 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,8 @@ import org.springframework.test.context.bean.override.BeanOverride;
* interfaces, the entire type hierarchy is searched. Alternatively, a factory
* method in an external class can be referenced via its fully-qualified method
* name following the syntax {@code <fully-qualified class name>#<method name>}
* &mdash; for example, {@code "org.example.TestUtils#createCustomerRepository"}.
* &mdash; for example,
* {@code @TestBean(methodName = "org.example.TestUtils#createCustomerRepository")}.
*
* <p>The factory method is deduced as follows.
*
@@ -144,7 +145,7 @@ public @interface TestBean {
* <p>Alternatively, a factory method in an external class can be referenced
* via its fully-qualified method name following the syntax
* {@code <fully-qualified class name>#<method name>} &mdash; for example,
* {@code "org.example.TestUtils#createCustomerRepository"}.
* {@code @TestBean(methodName = "org.example.TestUtils#createCustomerRepository")}.
* <p>If left unspecified, the name of the factory method will be detected
* based either on the name of the annotated field or the name of the bean.
*/

8
spring-test/src/main/java/org/springframework/test/context/bean/override/convention/TestBeanBeanOverrideHandler.java → spring-test/src/main/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideHandler.java
View File

@@ -29,19 +29,19 @@ import org.springframework.test.context.bean.override.BeanOverrideStrategy;
import org.springframework.util.ReflectionUtils;
/**
* {@link BeanOverrideHandler} implementation for {@link TestBean}.
* {@link BeanOverrideHandler} implementation for {@link TestBean @TestBean}.
*
* @author Simon Baslé
* @author Stephane Nicoll
* @author Sam Brannen
* @since 6.2
*/
final class TestBeanBeanOverrideHandler extends BeanOverrideHandler {
final class TestBeanOverrideHandler extends BeanOverrideHandler {
private final Method factoryMethod;
TestBeanBeanOverrideHandler(Field field, ResolvableType beanType, @Nullable String beanName,
TestBeanOverrideHandler(Field field, ResolvableType beanType, @Nullable String beanName,
BeanOverrideStrategy strategy, Method factoryMethod) {
super(field, beanType, beanName, strategy);
@@ -74,7 +74,7 @@ final class TestBeanBeanOverrideHandler extends BeanOverrideHandler {
if (!super.equals(other)) {
return false;
}
TestBeanBeanOverrideHandler that = (TestBeanBeanOverrideHandler) other;
TestBeanOverrideHandler that = (TestBeanOverrideHandler) other;
return Objects.equals(this.factoryMethod, that.factoryMethod);
}

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

@@ -42,7 +42,7 @@ import static org.springframework.test.context.bean.override.BeanOverrideStrateg
/**
* {@link BeanOverrideProcessor} implementation for {@link TestBean @TestBean}
* support, which creates a {@link TestBeanBeanOverrideHandler} for annotated
* support, which creates a {@link TestBeanOverrideHandler} for annotated
* fields in a given class and ensures that a corresponding static factory method
* exists, according to the {@linkplain TestBean documented conventions}.
*
@@ -54,7 +54,7 @@ import static org.springframework.test.context.bean.override.BeanOverrideStrateg
class TestBeanOverrideProcessor implements BeanOverrideProcessor {
@Override
public TestBeanBeanOverrideHandler createHandler(Annotation overrideAnnotation, Class<?> testClass, Field field) {
public TestBeanOverrideHandler createHandler(Annotation overrideAnnotation, Class<?> testClass, Field field) {
if (!(overrideAnnotation instanceof TestBean testBean)) {
throw new IllegalStateException("Invalid annotation passed to %s: expected @TestBean on field %s.%s"
.formatted(getClass().getSimpleName(), field.getDeclaringClass().getName(), field.getName()));
@@ -81,7 +81,7 @@ class TestBeanOverrideProcessor implements BeanOverrideProcessor {
factoryMethod = findTestBeanFactoryMethod(testClass, field.getType(), candidateMethodNames);
}
return new TestBeanBeanOverrideHandler(
return new TestBeanOverrideHandler(
field, ResolvableType.forField(field, testClass), beanName, strategy, factoryMethod);
}