root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Support @Value for record injection 

Add @Value support for record injection by disabling populateBean() for
records, since records are immutable.

See gh-28770
Closes gh-28774
This commit is contained in:
nanfeng 2022-07-08 10:59:55 +08:00 committed by Sam Brannen
parent c859211f7a
commit 7c9fc575ff
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
View File

@ -1353,6 +1353,10 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
* @param bw the BeanWrapper with bean instance * @param bw the BeanWrapper with bean instance
*/ */
protected void populateBean(String beanName, RootBeanDefinition mbd, @Nullable BeanWrapper bw) { protected void populateBean(String beanName, RootBeanDefinition mbd, @Nullable BeanWrapper bw) {
// record has not set methods
if (mbd.getBeanClass().isRecord()) {
return;
}
if (bw == null) { if (bw == null) {
if (mbd.hasPropertyValues()) { if (mbd.hasPropertyValues()) {
throw new BeanCreationException( throw new BeanCreationException(

14
spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
View File

@ -43,6 +43,7 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.annotation.AliasFor; import org.springframework.core.annotation.AliasFor;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.testfixture.stereotype.Component;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -233,6 +234,15 @@ class AutowiredConfigurationTests {
context.close(); context.close();
} }
@Test
void testValueInjectionWithRecord() {
System.setProperty("recordBeanName", "recordBean");
GenericApplicationContext context = new AnnotationConfigApplicationContext(RecordBean.class);
context.refresh();
RecordBean recordBean = context.getBean(RecordBean.class);
assertThat(recordBean.name()).isEqualTo("recordBean");
}
private int contentLength() throws IOException { private int contentLength() throws IOException {
return (int) new ClassPathResource("do_not_delete_me.txt").contentLength(); return (int) new ClassPathResource("do_not_delete_me.txt").contentLength();
} }
@ -506,4 +516,8 @@ class AutowiredConfigurationTests {
} }
} }
@Component
static record RecordBean(@Value("recordBeanName") String name) {
}
} }