Skip to content

Commit 88e2968

Browse files
snicollsnicoll
committed
Polish
1 parent f0f7f72 commit 88e2968

13 files changed

+22
-25
lines changed

‎spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ public Executable get(RegisteredBean registeredBean) {
446446
try {
447447
Class<?>[] actualParameterTypes = (!ClassUtils.isInnerClass(beanClass))
448448
? this.parameterTypes : ObjectUtils.addObjectToArray(
449-
this.parameterTypes, beanClass.getEnclosingClass(), 0);
449+
this.parameterTypes, beanClass.getEnclosingClass(), 0);
450450
return beanClass.getDeclaredConstructor(actualParameterTypes);
451451
}
452452
catch (NoSuchMethodException ex) {

‎spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationCodeGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ CodeBlock generateCode(GenerationContext generationContext) {
9090
generationContext, this, this.constructorOrFactoryMethod,
9191
this.instancePostProcessors.isEmpty());
9292
builder.add(this.codeFragments.generateSetBeanInstanceSupplierCode(generationContext,
93-
this, instanceSupplierCode, this.instancePostProcessors));
93+
this, instanceSupplierCode, this.instancePostProcessors));
9494
builder.add(this.codeFragments.generateReturnCode(generationContext, this));
9595
return builder.build();
9696
}

‎spring-beans/src/main/java/org/springframework/beans/factory/aot/ConstructorOrFactoryMethodResolver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,8 @@ private boolean isMatch(ResolvableType parameterType, ResolvableType valueType,
281281
return true;
282282
}
283283
return switch (fallbackMode) {
284-
case ASSIGNABLE_ELEMENT -> isAssignable(valueType).test(extractElementType(parameterType));
284+
case ASSIGNABLE_ELEMENT ->
285+
isAssignable(valueType).test(extractElementType(parameterType));
285286
case TYPE_CONVERSION -> typeConversionFallback(valueType).test(parameterType);
286287
default -> false;
287288
};

‎spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ private void buildGetInstanceMethodForConstructor(MethodSpec.Builder method,
174174
boolean hasArguments = constructor.getParameterCount() > 0;
175175
CodeBlock arguments = hasArguments
176176
? new AutowiredArgumentsCodeGenerator(declaringClass, constructor)
177-
.generateCode(constructor.getParameterTypes(), parameterOffset)
177+
.generateCode(constructor.getParameterTypes(), parameterOffset)
178178
: NO_ARGS;
179179
CodeBlock newInstance = generateNewInstanceCodeForConstructor(dependsOnBean,
180180
declaringClass, arguments);
@@ -267,7 +267,7 @@ private void buildGetInstanceMethodForFactoryMethod(MethodSpec.Builder method,
267267
boolean hasArguments = factoryMethod.getParameterCount() > 0;
268268
CodeBlock arguments = hasArguments
269269
? new AutowiredArgumentsCodeGenerator(declaringClass, factoryMethod)
270-
.generateCode(factoryMethod.getParameterTypes())
270+
.generateCode(factoryMethod.getParameterTypes())
271271
: NO_ARGS;
272272
CodeBlock newInstance = generateNewInstanceCodeForMethod(dependsOnBean,
273273
declaringClass, factoryMethodName, arguments);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void generatedCodeWhenSingleArgument() {
5252
}
5353

5454
@Test
55-
void generateCodeWhenMulitpleArguments() {
55+
void generateCodeWhenMultipleArguments() {
5656
Method method = ReflectionUtils.findMethod(UnambiguousMethods.class, "three",
5757
String.class, Integer.class, Boolean.class);
5858
AutowiredArgumentsCodeGenerator generator = new AutowiredArgumentsCodeGenerator(
@@ -62,7 +62,7 @@ void generateCodeWhenMulitpleArguments() {
6262
}
6363

6464
@Test
65-
void generateCodeWhenMulitpleArgumentsWithOffset() {
65+
void generateCodeWhenMultipleArgumentsWithOffset() {
6666
Constructor<?> constructor = Outer.Nested.class.getDeclaredConstructors()[0];
6767
AutowiredArgumentsCodeGenerator generator = new AutowiredArgumentsCodeGenerator(
6868
Outer.Nested.class, constructor);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ void forFieldWhenFieldNameIsEmptyThrowsException() {
6262

6363
@Test
6464
void resolveWhenRegisteredBeanIsNullThrowsException() {
65-
assertThatIllegalArgumentException().isThrownBy(
66-
() -> AutowiredFieldValueResolver.forField("string").resolve(null))
65+
assertThatIllegalArgumentException().isThrownBy(() ->
66+
AutowiredFieldValueResolver.forField("string").resolve(null))
6767
.withMessage("'registeredBean' must not be null");
6868
}
6969

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void resolveNonRequiredWhenNoSuchBeanReturnsNull() {
115115
}
116116

117117
@Test
118-
void resolveRequiredWithMultipleDependencesReturnsValue() {
118+
void resolveRequiredWithMultipleDependenciesReturnsValue() {
119119
Environment environment = mock(Environment.class);
120120
this.beanFactory.registerSingleton("test", "testValue");
121121
this.beanFactory.registerSingleton("environment", environment);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void getBeanDefinitionMethodGeneratorAddsContributionsFromProcessors() {
111111
}
112112

113113
@Test
114-
void getBeanDefinitionMethodGeneratorWhenRegisteredBeanIsAotProcessorFilteresBean() {
114+
void getBeanDefinitionMethodGeneratorWhenRegisteredBeanIsAotProcessorFiltersBean() {
115115
MockSpringFactoriesLoader springFactoriesLoader = new MockSpringFactoriesLoader();
116116
DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
117117
beanFactory.registerBeanDefinition("test1", BeanDefinitionBuilder
@@ -127,7 +127,7 @@ void getBeanDefinitionMethodGeneratorWhenRegisteredBeanIsAotProcessorFilteresBea
127127
}
128128

129129
@Test
130-
void getBeanDefinitionMethodGeneratorWhenRegisteredBeanIsAotProcessorAndFilteresBeanBeanRegistrationExcludeFilterDoesNotFilterBean() {
130+
void getBeanDefinitionMethodGeneratorWhenRegisteredBeanIsAotProcessorAndFiltersBeanBeanRegistrationExcludeFilterDoesNotFilterBean() {
131131
MockSpringFactoriesLoader springFactoriesLoader = new MockSpringFactoriesLoader();
132132
DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
133133
beanFactory.registerBeanDefinition("test", BeanDefinitionBuilder
@@ -179,7 +179,7 @@ static class TestBean {
179179

180180
}
181181

182-
static class TestBeanFactoryInitializationAotProcessorBean implements BeanFactoryInitializationAotProcessor{
182+
static class TestBeanFactoryInitializationAotProcessorBean implements BeanFactoryInitializationAotProcessor {
183183

184184
@Override
185185
public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) {

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,21 @@
5555
*/
5656
class BeanRegistrationsAotContributionTests {
5757

58-
private final MockSpringFactoriesLoader springFactoriesLoader;
58+
private final DefaultListableBeanFactory beanFactory;
5959

60-
private DefaultListableBeanFactory beanFactory;
60+
private final BeanDefinitionMethodGeneratorFactory methodGeneratorFactory;
6161

6262
private TestGenerationContext generationContext;
6363

64-
private final BeanDefinitionMethodGeneratorFactory methodGeneratorFactory;
65-
6664
private MockBeanFactoryInitializationCode beanFactoryInitializationCode;
6765

6866

6967
BeanRegistrationsAotContributionTests() {
70-
this.springFactoriesLoader = new MockSpringFactoriesLoader();
68+
MockSpringFactoriesLoader springFactoriesLoader = new MockSpringFactoriesLoader();
7169
this.beanFactory = new DefaultListableBeanFactory();
72-
this.generationContext = new TestGenerationContext();
7370
this.methodGeneratorFactory = new BeanDefinitionMethodGeneratorFactory(
74-
new AotFactoriesLoader(this.beanFactory, this.springFactoriesLoader));
71+
new AotFactoriesLoader(this.beanFactory, springFactoriesLoader));
72+
this.generationContext = new TestGenerationContext();
7573
this.beanFactoryInitializationCode = new MockBeanFactoryInitializationCode(this.generationContext);
7674
}
7775

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ void beanDefinitionWithClassArrayFactoryMethodArgAndStringArrayValueType() {
305305
void beanDefinitionWithClassArrayFactoryMethodArgAndAnotherMatchingConstructor() {
306306
DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
307307
BeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(
308-
ClassArrayFactoryMethodSampleWithAnotherFactoryMethod.class.getName())
308+
ClassArrayFactoryMethodSampleWithAnotherFactoryMethod.class.getName())
309309
.setFactoryMethod("of").addConstructorArgValue("test1")
310310
.getBeanDefinition();
311311
Executable executable = resolve(beanFactory, beanDefinition);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void getTargetOnConstructorToProtectedFactoryBean() {
8686
RegisteredBean registeredBean = registerTestBean(SimpleBean.class);
8787
assertThat(createInstance(registeredBean).getTarget(registeredBean,
8888
PrivilegedTestBeanFactoryBean.class.getDeclaredConstructors()[0])).isEqualTo(
89-
PrivilegedTestBeanFactoryBean.class);
89+
PrivilegedTestBeanFactoryBean.class);
9090
}
9191

9292
@Test

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public enum EnumWithClassBody {
3232
* With class body.
3333
*/
3434
TWO {
35-
3635
@Override
3736
public String toString() {
3837
return "2";

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ void generateWhenHasConstructorWithGeneric() {
147147
compile(beanFactory, beanDefinition, (instanceSupplier, compiled) -> {
148148
NumberHolder<?> bean = getBean(beanFactory, beanDefinition, instanceSupplier);
149149
assertThat(bean).isInstanceOf(NumberHolder.class);
150-
assertThat(bean).extracting("number").isNull(); // No property
151-
// actually set
150+
assertThat(bean).extracting("number").isNull(); // No property actually set
152151
assertThat(compiled.getSourceFile()).contains("NumberHolderFactoryBean::new");
153152
});
154153
assertThat(getReflectionHints().getTypeHint(NumberHolderFactoryBean.class))

0 commit comments

Comments
 (0)