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

Polish naming

Browse Source 
Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
This commit is contained in:
Stephane Nicoll
2022-02-22 16:07:52 +01:00
parent e85001f332
commit b4eb895927
6 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstanceContributorTests.java → spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstantiationContributorTests.java
View File

@@ -24,7 +24,7 @@ import org.springframework.aot.hint.ExecutableMode;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.TypeReference;
import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessorTests.ResourceInjectionBean;
import org.springframework.beans.factory.generator.BeanInstanceContributor;
import org.springframework.beans.factory.generator.BeanInstantiationContributor;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.env.Environment;
@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Stephane Nicoll
*/
class AutowiredAnnotationBeanInstanceContributorTests {
class AutowiredAnnotationBeanInstantiationContributorTests {
@Test
void buildAotContributorWithPackageProtectedFieldInjection() {
@@ -63,7 +63,7 @@ class AutowiredAnnotationBeanInstanceContributorTests {
assertThat(CodeSnippet.process(contribution.statements().toCodeBlock())).isEqualTo("""
instanceContext.field("environment", Environment.class)
.invoke(beanFactory, (attributes) -> {
Field environmentField = ReflectionUtils.findField(AutowiredAnnotationBeanInstanceContributorTests.PrivateFieldInjectionSample.class, "environment", Environment.class);
Field environmentField = ReflectionUtils.findField(AutowiredAnnotationBeanInstantiationContributorTests.PrivateFieldInjectionSample.class, "environment", Environment.class);
ReflectionUtils.makeAccessible(environmentField);
ReflectionUtils.setField(environmentField, bean, attributes.get(0));
})""");
@@ -117,19 +117,19 @@ class AutowiredAnnotationBeanInstanceContributorTests {
@Test
void buildAotContributorWithoutInjectionPoints() {
BeanInstanceContributor contributor = createAotContributor(String.class);
assertThat(contributor).isNotNull().isSameAs(BeanInstanceContributor.NO_OP);
BeanInstantiationContributor contributor = createAotContributor(String.class);
assertThat(contributor).isNotNull().isSameAs(BeanInstantiationContributor.NO_OP);
}
private DefaultCodeContribution contribute(Class<?> type) {
BeanInstanceContributor contributor = createAotContributor(type);
BeanInstantiationContributor contributor = createAotContributor(type);
assertThat(contributor).isNotNull();
DefaultCodeContribution contribution = new DefaultCodeContribution(new RuntimeHints());
contributor.contribute(contribution);
return contribution;
}
private BeanInstanceContributor createAotContributor(Class<?> type) {
private BeanInstantiationContributor createAotContributor(Class<?> type) {
AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
RootBeanDefinition beanDefinition = new RootBeanDefinition(type);
return bpp.buildAotContributor(beanDefinition, type, "test");

14
spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGeneratorTests.java → spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstantiationGeneratorTests.java
View File

@@ -48,11 +48,11 @@ import org.springframework.util.ReflectionUtils;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link DefaultBeanInstanceGenerator}.
* Tests for {@link DefaultBeanInstantiationGenerator}.
*
* @author Stephane Nicoll
*/
class DefaultBeanInstanceGeneratorTests {
class DefaultBeanInstantiationGeneratorTests {
@Test
void generateUsingDefaultConstructorUsesMethodReference() {
@@ -109,7 +109,7 @@ class DefaultBeanInstanceGeneratorTests {
void generateUsingNoArgConstructorAndContributorsDoesNotUseMethodReference() {
CodeContribution contribution = generate(SimpleConfiguration.class.getDeclaredConstructors()[0],
contrib -> contrib.statements().add(CodeBlock.of("// hello\n")),
BeanInstanceContributor.NO_OP);
BeanInstantiationContributor.NO_OP);
assertThat(code(contribution)).isEqualTo("""
(instanceContext) -> {
SimpleConfiguration bean = new SimpleConfiguration();
@@ -240,10 +240,10 @@ class DefaultBeanInstanceGeneratorTests {
}
private CodeContribution generate(Executable executable,
BeanInstanceContributor... beanInstanceContributors) {
DefaultBeanInstanceGenerator generator = new DefaultBeanInstanceGenerator(executable,
Arrays.asList(beanInstanceContributors));
return generator.generateBeanInstance(new RuntimeHints());
BeanInstantiationContributor... beanInstantiationContributors) {
DefaultBeanInstantiationGenerator generator = new DefaultBeanInstantiationGenerator(executable,
Arrays.asList(beanInstantiationContributors));
return generator.generateBeanInstantiation(new RuntimeHints());
}
private static Method method(Class<?> type, String methodName, Class<?>... parameterTypes) {