Skip to content

Commit 364186e

Browse files
committed
Polishing
1 parent 047c2c1 commit 364186e

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,7 @@ void generateBeanDefinitionMethodWhenHasInstancePostProcessorAndFactoryMethodGen
399399
compile(method, (actual, compiled) -> {
400400
assertThat(compiled.getSourceFile(".*BeanDefinitions")).contains("BeanInstanceSupplier");
401401
assertThat(actual.getBeanClass()).isEqualTo(TestBean.class);
402-
InstanceSupplier<?> supplier = (InstanceSupplier<?>) actual
403-
.getInstanceSupplier();
402+
InstanceSupplier<?> supplier = (InstanceSupplier<?>) actual.getInstanceSupplier();
404403
try {
405404
TestBean instance = (TestBean) supplier.get(registeredBean);
406405
assertThat(instance.getName()).isEqualTo("postprocessed");
@@ -529,8 +528,7 @@ void generateBeanDefinitionMethodWhenHasInnerBeanPropertyValueGeneratesMethod()
529528
assertThat(actualInnerBeanDefinition.isPrimary()).isTrue();
530529
assertThat(actualInnerBeanDefinition.getRole())
531530
.isEqualTo(BeanDefinition.ROLE_INFRASTRUCTURE);
532-
Supplier<?> innerInstanceSupplier = actualInnerBeanDefinition
533-
.getInstanceSupplier();
531+
Supplier<?> innerInstanceSupplier = actualInnerBeanDefinition.getInstanceSupplier();
534532
try {
535533
assertThat(innerInstanceSupplier.get()).isInstanceOf(AnnotatedBean.class);
536534
}
@@ -595,8 +593,7 @@ void generateBeanDefinitionMethodWhenHasInnerBeanConstructorValueGeneratesMethod
595593
assertThat(actualInnerBeanDefinition.isPrimary()).isTrue();
596594
assertThat(actualInnerBeanDefinition.getRole())
597595
.isEqualTo(BeanDefinition.ROLE_INFRASTRUCTURE);
598-
Supplier<?> innerInstanceSupplier = actualInnerBeanDefinition
599-
.getInstanceSupplier();
596+
Supplier<?> innerInstanceSupplier = actualInnerBeanDefinition.getInstanceSupplier();
600597
try {
601598
assertThat(innerInstanceSupplier.get()).isInstanceOf(String.class);
602599
}

spring-beans/src/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,21 +105,18 @@ void generateWhenHasConstructorWithParameter() {
105105
this.beanFactory.registerSingleton("injected", "injected");
106106
compile(beanDefinition, (instanceSupplier, compiled) -> {
107107
InjectionComponent bean = getBean(beanDefinition, instanceSupplier);
108-
assertThat(bean).isInstanceOf(InjectionComponent.class).extracting("bean")
109-
.isEqualTo("injected");
108+
assertThat(bean).isInstanceOf(InjectionComponent.class).extracting("bean").isEqualTo("injected");
110109
});
111110
assertThat(getReflectionHints().getTypeHint(InjectionComponent.class))
112111
.satisfies(hasConstructorWithMode(ExecutableMode.INTROSPECT));
113112
}
114113

115114
@Test
116115
void generateWhenHasConstructorWithInnerClassAndDefaultConstructor() {
117-
RootBeanDefinition beanDefinition = new RootBeanDefinition(
118-
NoDependencyComponent.class);
116+
RootBeanDefinition beanDefinition = new RootBeanDefinition(NoDependencyComponent.class);
119117
this.beanFactory.registerSingleton("configuration", new InnerComponentConfiguration());
120118
compile(beanDefinition, (instanceSupplier, compiled) -> {
121-
NoDependencyComponent bean = getBean(beanDefinition,
122-
instanceSupplier);
119+
NoDependencyComponent bean = getBean(beanDefinition, instanceSupplier);
123120
assertThat(bean).isInstanceOf(NoDependencyComponent.class);
124121
assertThat(compiled.getSourceFile()).contains(
125122
"getBeanFactory().getBean(InnerComponentConfiguration.class).new NoDependencyComponent()");
@@ -130,13 +127,11 @@ void generateWhenHasConstructorWithInnerClassAndDefaultConstructor() {
130127

131128
@Test
132129
void generateWhenHasConstructorWithInnerClassAndParameter() {
133-
BeanDefinition beanDefinition = new RootBeanDefinition(
134-
EnvironmentAwareComponent.class);
130+
BeanDefinition beanDefinition = new RootBeanDefinition(EnvironmentAwareComponent.class);
135131
this.beanFactory.registerSingleton("configuration", new InnerComponentConfiguration());
136132
this.beanFactory.registerSingleton("environment", new StandardEnvironment());
137133
compile(beanDefinition, (instanceSupplier, compiled) -> {
138-
EnvironmentAwareComponent bean = getBean(beanDefinition,
139-
instanceSupplier);
134+
EnvironmentAwareComponent bean = getBean(beanDefinition, instanceSupplier);
140135
assertThat(bean).isInstanceOf(EnvironmentAwareComponent.class);
141136
assertThat(compiled.getSourceFile()).contains(
142137
"getBeanFactory().getBean(InnerComponentConfiguration.class).new EnvironmentAwareComponent(");
@@ -147,8 +142,7 @@ void generateWhenHasConstructorWithInnerClassAndParameter() {
147142

148143
@Test
149144
void generateWhenHasConstructorWithGeneric() {
150-
BeanDefinition beanDefinition = new RootBeanDefinition(
151-
NumberHolderFactoryBean.class);
145+
BeanDefinition beanDefinition = new RootBeanDefinition(NumberHolderFactoryBean.class);
152146
this.beanFactory.registerSingleton("number", 123);
153147
compile(beanDefinition, (instanceSupplier, compiled) -> {
154148
NumberHolder<?> bean = getBean(beanDefinition, instanceSupplier);
@@ -162,11 +156,9 @@ void generateWhenHasConstructorWithGeneric() {
162156

163157
@Test
164158
void generateWhenHasPrivateConstructor() {
165-
BeanDefinition beanDefinition = new RootBeanDefinition(
166-
TestBeanWithPrivateConstructor.class);
159+
BeanDefinition beanDefinition = new RootBeanDefinition(TestBeanWithPrivateConstructor.class);
167160
compile(beanDefinition, (instanceSupplier, compiled) -> {
168-
TestBeanWithPrivateConstructor bean = getBean(beanDefinition,
169-
instanceSupplier);
161+
TestBeanWithPrivateConstructor bean = getBean(beanDefinition, instanceSupplier);
170162
assertThat(bean).isInstanceOf(TestBeanWithPrivateConstructor.class);
171163
assertThat(compiled.getSourceFile())
172164
.contains("return BeanInstanceSupplier.<TestBeanWithPrivateConstructor>forConstructor();");

0 commit comments

Comments
 (0)