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

Polish "Support @Value for record injection" 

See gh-28774
This commit is contained in:
Sam Brannen 2023-02-28 13:06:18 +01:00
parent 7c9fc575ff
commit 00c2c1d2a1
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1353,10 +1353,6 @@ 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(
@ -1368,6 +1364,17 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
} }
} }
if (bw.getWrappedClass().isRecord()) {
if (mbd.hasPropertyValues()) {
throw new BeanCreationException(
mbd.getResourceDescription(), beanName, "Cannot apply property values to a record");
}
else {
// Skip property population phase for records since they are immutable.
return;
}
}
// Give any InstantiationAwareBeanPostProcessors the opportunity to modify the // Give any InstantiationAwareBeanPostProcessors the opportunity to modify the
// state of the bean before properties are set. This can be used, for example, // state of the bean before properties are set. This can be used, for example,
// to support styles of field injection. // to support styles of field injection.

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -43,7 +43,6 @@ 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;
@ -236,11 +235,13 @@ class AutowiredConfigurationTests {
@Test @Test
void testValueInjectionWithRecord() { void testValueInjectionWithRecord() {
System.setProperty("recordBeanName", "recordBean"); System.setProperty("recordBeanName", "enigma");
GenericApplicationContext context = new AnnotationConfigApplicationContext(RecordBean.class); try (GenericApplicationContext context = new AnnotationConfigApplicationContext(RecordBean.class)) {
context.refresh(); assertThat(context.getBean(RecordBean.class).name()).isEqualTo("enigma");
RecordBean recordBean = context.getBean(RecordBean.class); }
assertThat(recordBean.name()).isEqualTo("recordBean"); finally {
System.clearProperty("recordBeanName");
}
} }
private int contentLength() throws IOException { private int contentLength() throws IOException {
@ -517,7 +518,7 @@ class AutowiredConfigurationTests {
} }
@Component record RecordBean(@Value("${recordBeanName}") String name) {
static record RecordBean(@Value("recordBeanName") String name) {
} }
} }