From f26a266c412d62044e2789c422821f7ea2c3056a Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Thu, 3 Oct 2024 16:17:48 +0200 Subject: [PATCH] Optimize BeanOverrideRegistrar lookup in BeanOverrideTestExecutionListener --- .../context/bean/override/BeanOverrideContextCustomizer.java | 2 +- .../bean/override/BeanOverrideTestExecutionListener.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizer.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizer.java index acf425e4b59..0b1d3907012 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizer.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizer.java @@ -38,7 +38,7 @@ import org.springframework.test.context.MergedContextConfiguration; */ class BeanOverrideContextCustomizer implements ContextCustomizer { - private static final String REGISTRAR_BEAN_NAME = + static final String REGISTRAR_BEAN_NAME = "org.springframework.test.context.bean.override.internalBeanOverrideRegistrar"; private static final String INFRASTRUCTURE_BEAN_NAME = diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java index 10a59a5d301..a9bc8fbdef8 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java @@ -93,8 +93,8 @@ public class BeanOverrideTestExecutionListener extends AbstractTestExecutionList List metadataForFields = OverrideMetadata.forTestClass(testClass); if (!metadataForFields.isEmpty()) { - BeanOverrideRegistrar registrar = - testContext.getApplicationContext().getBean(BeanOverrideRegistrar.class); + BeanOverrideRegistrar registrar = testContext.getApplicationContext() + .getBean(BeanOverrideContextCustomizer.REGISTRAR_BEAN_NAME, BeanOverrideRegistrar.class); for (OverrideMetadata metadata : metadataForFields) { consumer.accept(new TestContextOverrideMetadata(testInstance, metadata), registrar); }