Skip to content

Commit c3e18bc

Browse files
jhoellerjhoeller
committed
Retain metadata during bean creation even with cacheBeanMetadata=false
Closes gh-23795 Closes gh-25749
1 parent c942c04 commit c3e18bc

File tree

3 files changed

+131
-11
lines changed

3 files changed

+131
-11
lines changed

‎spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,9 @@ else if (mbd.isPrototype()) {
383383
}
384384
finally {
385385
beanCreation.end();
386+
if (!isCacheBeanMetadata()) {
387+
clearMergedBeanDefinition(beanName);
388+
}
386389
}
387390
}
388391

@@ -583,7 +586,6 @@ else if (containsSingleton(beanName) && !containsBeanDefinition(beanName)) {
583586
Class<?>[] typesToMatch = (FactoryBean.class == classToMatch ?
584587
new Class<?>[] {classToMatch} : new Class<?>[] {FactoryBean.class, classToMatch});
585588

586-
587589
// Attempt to predict the bean type
588590
Class<?> predictedType = null;
589591

@@ -1409,7 +1411,7 @@ protected RootBeanDefinition getMergedBeanDefinition(
14091411

14101412
// Cache the merged bean definition for the time being
14111413
// (it might still get re-merged later on in order to pick up metadata changes)
1412-
if (containingBd == null && isCacheBeanMetadata()) {
1414+
if (containingBd == null && (isCacheBeanMetadata() || isBeanEligibleForMetadataCaching(beanName))) {
14131415
this.mergedBeanDefinitions.put(beanName, mbd);
14141416
}
14151417
}
@@ -1433,6 +1435,9 @@ private void copyRelevantMergedBeanDefinitionCaches(RootBeanDefinition previous,
14331435
mbd.factoryMethodReturnType = previous.factoryMethodReturnType;
14341436
mbd.factoryMethodToIntrospect = previous.factoryMethodToIntrospect;
14351437
}
1438+
if (previous.hasMethodOverrides()) {
1439+
mbd.setMethodOverrides(new MethodOverrides(previous.getMethodOverrides()));
1440+
}
14361441
}
14371442
}
14381443

‎spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -53,7 +53,6 @@ public void setup() {
5353
@Test
5454
public void testWithoutConstructorArg() {
5555
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
56-
assertThat(bean).isNotNull();
5756
Object expected = bean.get();
5857
assertThat(expected.getClass()).isEqualTo(TestBean.class);
5958
assertThat(beanFactory.getBean(BeanConsumer.class).abstractBean).isSameAs(bean);
@@ -62,7 +61,6 @@ public void testWithoutConstructorArg() {
6261
@Test
6362
public void testWithOverloadedArg() {
6463
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
65-
assertThat(bean).isNotNull();
6664
TestBean expected = bean.get("haha");
6765
assertThat(expected.getClass()).isEqualTo(TestBean.class);
6866
assertThat(expected.getName()).isEqualTo("haha");
@@ -72,7 +70,6 @@ public void testWithOverloadedArg() {
7270
@Test
7371
public void testWithOneConstructorArg() {
7472
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
75-
assertThat(bean).isNotNull();
7673
TestBean expected = bean.getOneArgument("haha");
7774
assertThat(expected.getClass()).isEqualTo(TestBean.class);
7875
assertThat(expected.getName()).isEqualTo("haha");
@@ -82,7 +79,6 @@ public void testWithOneConstructorArg() {
8279
@Test
8380
public void testWithTwoConstructorArg() {
8481
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
85-
assertThat(bean).isNotNull();
8682
TestBean expected = bean.getTwoArguments("haha", 72);
8783
assertThat(expected.getClass()).isEqualTo(TestBean.class);
8884
assertThat(expected.getName()).isEqualTo("haha");
@@ -93,7 +89,6 @@ public void testWithTwoConstructorArg() {
9389
@Test
9490
public void testWithThreeArgsShouldFail() {
9591
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
96-
assertThat(bean).isNotNull();
9792
assertThatExceptionOfType(AbstractMethodError.class).as("TestBean has no three arg constructor").isThrownBy(() ->
9893
bean.getThreeArguments("name", 1, 2));
9994
assertThat(beanFactory.getBean(BeanConsumer.class).abstractBean).isSameAs(bean);
@@ -102,7 +97,6 @@ public void testWithThreeArgsShouldFail() {
10297
@Test
10398
public void testWithEarlyInjection() {
10499
AbstractBean bean = beanFactory.getBean("beanConsumer", BeanConsumer.class).abstractBean;
105-
assertThat(bean).isNotNull();
106100
Object expected = bean.get();
107101
assertThat(expected.getClass()).isEqualTo(TestBean.class);
108102
assertThat(beanFactory.getBean(BeanConsumer.class).abstractBean).isSameAs(bean);
@@ -115,7 +109,6 @@ public void testWithNullBean() {
115109
beanFactory.registerBeanDefinition("testBean", tbd);
116110

117111
AbstractBean bean = beanFactory.getBean("beanConsumer", BeanConsumer.class).abstractBean;
118-
assertThat(bean).isNotNull();
119112
Object expected = bean.get();
120113
assertThat(expected).isNull();
121114
assertThat(beanFactory.getBean(BeanConsumer.class).abstractBean).isSameAs(bean);
@@ -128,7 +121,36 @@ public void testWithGenericBean() {
128121
beanFactory.registerBeanDefinition("floatStore", new RootBeanDefinition(FloatStore.class));
129122

130123
NumberBean bean = (NumberBean) beanFactory.getBean("numberBean");
131-
assertThat(bean).isNotNull();
124+
assertThat(beanFactory.getBean(DoubleStore.class)).isSameAs(bean.getDoubleStore());
125+
assertThat(beanFactory.getBean(FloatStore.class)).isSameAs(bean.getFloatStore());
126+
}
127+
128+
@Test
129+
public void testSingletonWithoutMetadataCaching() {
130+
beanFactory.setCacheBeanMetadata(false);
131+
132+
beanFactory.registerBeanDefinition("numberBean", new RootBeanDefinition(NumberBean.class));
133+
beanFactory.registerBeanDefinition("doubleStore", new RootBeanDefinition(DoubleStore.class));
134+
beanFactory.registerBeanDefinition("floatStore", new RootBeanDefinition(FloatStore.class));
135+
136+
NumberBean bean = (NumberBean) beanFactory.getBean("numberBean");
137+
assertThat(beanFactory.getBean(DoubleStore.class)).isSameAs(bean.getDoubleStore());
138+
assertThat(beanFactory.getBean(FloatStore.class)).isSameAs(bean.getFloatStore());
139+
}
140+
141+
@Test
142+
public void testPrototypeWithoutMetadataCaching() {
143+
beanFactory.setCacheBeanMetadata(false);
144+
145+
beanFactory.registerBeanDefinition("numberBean", new RootBeanDefinition(NumberBean.class, BeanDefinition.SCOPE_PROTOTYPE, null));
146+
beanFactory.registerBeanDefinition("doubleStore", new RootBeanDefinition(DoubleStore.class));
147+
beanFactory.registerBeanDefinition("floatStore", new RootBeanDefinition(FloatStore.class));
148+
149+
NumberBean bean = (NumberBean) beanFactory.getBean("numberBean");
150+
assertThat(beanFactory.getBean(DoubleStore.class)).isSameAs(bean.getDoubleStore());
151+
assertThat(beanFactory.getBean(FloatStore.class)).isSameAs(bean.getFloatStore());
152+
153+
bean = (NumberBean) beanFactory.getBean("numberBean");
132154
assertThat(beanFactory.getBean(DoubleStore.class)).isSameAs(bean.getDoubleStore());
133155
assertThat(beanFactory.getBean(FloatStore.class)).isSameAs(bean.getFloatStore());
134156
}

‎spring-context/src/test/java/org/springframework/context/annotation/FactoryMethodResolutionTests.java

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
/*
2+
* Copyright 2002-2023 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.context.annotation;
18+
19+
import java.lang.annotation.ElementType;
20+
import java.lang.annotation.Retention;
21+
import java.lang.annotation.RetentionPolicy;
22+
import java.lang.annotation.Target;
23+
24+
import org.junit.jupiter.api.Test;
25+
26+
import org.springframework.beans.factory.config.BeanDefinition;
27+
import org.springframework.beans.factory.support.RootBeanDefinition;
28+
import org.springframework.core.type.AnnotationMetadata;
29+
30+
import static org.assertj.core.api.Assertions.assertThat;
31+
32+
/**
33+
* @author Andy Wilkinson
34+
*/
35+
class FactoryMethodResolutionTests {
36+
37+
@Test
38+
void factoryMethodCanBeResolvedWithBeanMetadataCachingEnabled() {
39+
assertThatFactoryMethodCanBeResolved(true);
40+
}
41+
42+
@Test
43+
void factoryMethodCanBeResolvedWithBeanMetadataCachingDisabled() {
44+
assertThatFactoryMethodCanBeResolved(false);
45+
}
46+
47+
private void assertThatFactoryMethodCanBeResolved(boolean cache) {
48+
try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext()) {
49+
context.getBeanFactory().setCacheBeanMetadata(cache);
50+
context.register(ImportSelectorConfiguration.class);
51+
context.refresh();
52+
BeanDefinition definition = context.getBeanFactory().getMergedBeanDefinition("exampleBean");
53+
assertThat(((RootBeanDefinition)definition).getResolvedFactoryMethod()).isNotNull();
54+
}
55+
}
56+
57+
58+
@Configuration
59+
@Import(ExampleImportSelector.class)
60+
static class ImportSelectorConfiguration {
61+
}
62+
63+
64+
static class ExampleImportSelector implements ImportSelector {
65+
66+
@Override
67+
public String[] selectImports(AnnotationMetadata importingClassMetadata) {
68+
return new String[] { TestConfiguration.class.getName() };
69+
}
70+
}
71+
72+
73+
@Configuration
74+
static class TestConfiguration {
75+
76+
@Bean
77+
@ExampleAnnotation
78+
public ExampleBean exampleBean() {
79+
return new ExampleBean();
80+
}
81+
}
82+
83+
84+
static class ExampleBean {
85+
}
86+
87+
88+
@Target(ElementType.METHOD)
89+
@Retention(RetentionPolicy.RUNTIME)
90+
@interface ExampleAnnotation {
91+
}
92+
93+
}

0 commit comments

Comments
 (0)