From 88e29689b666a0236abda89c9288137d39ee1a4a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 27 Jul 2022 15:10:09 +0200 Subject: [PATCH] Polish --- .../beans/factory/aot/BeanInstanceSupplier.java | 2 +- .../factory/aot/BeanRegistrationCodeGenerator.java | 2 +- .../aot/ConstructorOrFactoryMethodResolver.java | 3 ++- .../factory/aot/InstanceSupplierCodeGenerator.java | 4 ++-- .../aot/AutowiredArgumentsCodeGeneratorTests.java | 4 ++-- .../aot/AutowiredFieldValueResolverTests.java | 4 ++-- .../aot/AutowiredMethodArgumentsResolverTests.java | 2 +- .../BeanDefinitionMethodGeneratorFactoryTests.java | 6 +++--- .../aot/BeanRegistrationsAotContributionTests.java | 14 ++++++-------- .../ConstructorOrFactoryMethodResolverTests.java | 2 +- .../DefaultBeanRegistrationCodeFragmentsTests.java | 2 +- .../beans/factory/aot/EnumWithClassBody.java | 1 - .../aot/InstanceSupplierCodeGeneratorTests.java | 3 +-- 13 files changed, 23 insertions(+), 26 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java index a7f1ccfe596..13eee5161cd 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java @@ -446,7 +446,7 @@ public final class BeanInstanceSupplier extends AutowiredElementResolver impl try { Class[] actualParameterTypes = (!ClassUtils.isInnerClass(beanClass)) ? this.parameterTypes : ObjectUtils.addObjectToArray( - this.parameterTypes, beanClass.getEnclosingClass(), 0); + this.parameterTypes, beanClass.getEnclosingClass(), 0); return beanClass.getDeclaredConstructor(actualParameterTypes); } catch (NoSuchMethodException ex) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationCodeGenerator.java index 7de3f8e1e47..0eb4ef41d5a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationCodeGenerator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationCodeGenerator.java @@ -90,7 +90,7 @@ class BeanRegistrationCodeGenerator implements BeanRegistrationCode { generationContext, this, this.constructorOrFactoryMethod, this.instancePostProcessors.isEmpty()); builder.add(this.codeFragments.generateSetBeanInstanceSupplierCode(generationContext, - this, instanceSupplierCode, this.instancePostProcessors)); + this, instanceSupplierCode, this.instancePostProcessors)); builder.add(this.codeFragments.generateReturnCode(generationContext, this)); return builder.build(); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/ConstructorOrFactoryMethodResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/ConstructorOrFactoryMethodResolver.java index 98c4d6a3c81..731b8b87ba1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/ConstructorOrFactoryMethodResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/ConstructorOrFactoryMethodResolver.java @@ -281,7 +281,8 @@ class ConstructorOrFactoryMethodResolver { return true; } return switch (fallbackMode) { - case ASSIGNABLE_ELEMENT -> isAssignable(valueType).test(extractElementType(parameterType)); + case ASSIGNABLE_ELEMENT -> + isAssignable(valueType).test(extractElementType(parameterType)); case TYPE_CONVERSION -> typeConversionFallback(valueType).test(parameterType); default -> false; }; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java index f8acaec900e..1728e41ee3f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java @@ -174,7 +174,7 @@ class InstanceSupplierCodeGenerator { boolean hasArguments = constructor.getParameterCount() > 0; CodeBlock arguments = hasArguments ? new AutowiredArgumentsCodeGenerator(declaringClass, constructor) - .generateCode(constructor.getParameterTypes(), parameterOffset) + .generateCode(constructor.getParameterTypes(), parameterOffset) : NO_ARGS; CodeBlock newInstance = generateNewInstanceCodeForConstructor(dependsOnBean, declaringClass, arguments); @@ -267,7 +267,7 @@ class InstanceSupplierCodeGenerator { boolean hasArguments = factoryMethod.getParameterCount() > 0; CodeBlock arguments = hasArguments ? new AutowiredArgumentsCodeGenerator(declaringClass, factoryMethod) - .generateCode(factoryMethod.getParameterTypes()) + .generateCode(factoryMethod.getParameterTypes()) : NO_ARGS; CodeBlock newInstance = generateNewInstanceCodeForMethod(dependsOnBean, declaringClass, factoryMethodName, arguments); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGeneratorTests.java index 67a3c5eb632..7f35baca323 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGeneratorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGeneratorTests.java @@ -52,7 +52,7 @@ class AutowiredArgumentsCodeGeneratorTests { } @Test - void generateCodeWhenMulitpleArguments() { + void generateCodeWhenMultipleArguments() { Method method = ReflectionUtils.findMethod(UnambiguousMethods.class, "three", String.class, Integer.class, Boolean.class); AutowiredArgumentsCodeGenerator generator = new AutowiredArgumentsCodeGenerator( @@ -62,7 +62,7 @@ class AutowiredArgumentsCodeGeneratorTests { } @Test - void generateCodeWhenMulitpleArgumentsWithOffset() { + void generateCodeWhenMultipleArgumentsWithOffset() { Constructor constructor = Outer.Nested.class.getDeclaredConstructors()[0]; AutowiredArgumentsCodeGenerator generator = new AutowiredArgumentsCodeGenerator( Outer.Nested.class, constructor); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolverTests.java index 3e05cfadb64..2a2389c5c6a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolverTests.java @@ -62,8 +62,8 @@ class AutowiredFieldValueResolverTests { @Test void resolveWhenRegisteredBeanIsNullThrowsException() { - assertThatIllegalArgumentException().isThrownBy( - () -> AutowiredFieldValueResolver.forField("string").resolve(null)) + assertThatIllegalArgumentException().isThrownBy(() -> + AutowiredFieldValueResolver.forField("string").resolve(null)) .withMessage("'registeredBean' must not be null"); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java index a8413a0ded7..e1ec79c3546 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java @@ -115,7 +115,7 @@ class AutowiredMethodArgumentsResolverTests { } @Test - void resolveRequiredWithMultipleDependencesReturnsValue() { + void resolveRequiredWithMultipleDependenciesReturnsValue() { Environment environment = mock(Environment.class); this.beanFactory.registerSingleton("test", "testValue"); this.beanFactory.registerSingleton("environment", environment); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java index 247216a7c51..ba58f2ec1da 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java @@ -111,7 +111,7 @@ class BeanDefinitionMethodGeneratorFactoryTests { } @Test - void getBeanDefinitionMethodGeneratorWhenRegisteredBeanIsAotProcessorFilteresBean() { + void getBeanDefinitionMethodGeneratorWhenRegisteredBeanIsAotProcessorFiltersBean() { MockSpringFactoriesLoader springFactoriesLoader = new MockSpringFactoriesLoader(); DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); beanFactory.registerBeanDefinition("test1", BeanDefinitionBuilder @@ -127,7 +127,7 @@ class BeanDefinitionMethodGeneratorFactoryTests { } @Test - void getBeanDefinitionMethodGeneratorWhenRegisteredBeanIsAotProcessorAndFilteresBeanBeanRegistrationExcludeFilterDoesNotFilterBean() { + void getBeanDefinitionMethodGeneratorWhenRegisteredBeanIsAotProcessorAndFiltersBeanBeanRegistrationExcludeFilterDoesNotFilterBean() { MockSpringFactoriesLoader springFactoriesLoader = new MockSpringFactoriesLoader(); DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); beanFactory.registerBeanDefinition("test", BeanDefinitionBuilder @@ -179,7 +179,7 @@ class BeanDefinitionMethodGeneratorFactoryTests { } - static class TestBeanFactoryInitializationAotProcessorBean implements BeanFactoryInitializationAotProcessor{ + static class TestBeanFactoryInitializationAotProcessorBean implements BeanFactoryInitializationAotProcessor { @Override public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) { diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java index 15b2d650024..b9604e5a639 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java @@ -55,23 +55,21 @@ import static org.assertj.core.api.Assertions.assertThat; */ class BeanRegistrationsAotContributionTests { - private final MockSpringFactoriesLoader springFactoriesLoader; - - private DefaultListableBeanFactory beanFactory; - - private TestGenerationContext generationContext; + private final DefaultListableBeanFactory beanFactory; private final BeanDefinitionMethodGeneratorFactory methodGeneratorFactory; + private TestGenerationContext generationContext; + private MockBeanFactoryInitializationCode beanFactoryInitializationCode; BeanRegistrationsAotContributionTests() { - this.springFactoriesLoader = new MockSpringFactoriesLoader(); + MockSpringFactoriesLoader springFactoriesLoader = new MockSpringFactoriesLoader(); this.beanFactory = new DefaultListableBeanFactory(); - this.generationContext = new TestGenerationContext(); this.methodGeneratorFactory = new BeanDefinitionMethodGeneratorFactory( - new AotFactoriesLoader(this.beanFactory, this.springFactoriesLoader)); + new AotFactoriesLoader(this.beanFactory, springFactoriesLoader)); + this.generationContext = new TestGenerationContext(); this.beanFactoryInitializationCode = new MockBeanFactoryInitializationCode(this.generationContext); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/ConstructorOrFactoryMethodResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/ConstructorOrFactoryMethodResolverTests.java index 7db5004dc54..cfc238764e0 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/ConstructorOrFactoryMethodResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/ConstructorOrFactoryMethodResolverTests.java @@ -305,7 +305,7 @@ class ConstructorOrFactoryMethodResolverTests { void beanDefinitionWithClassArrayFactoryMethodArgAndAnotherMatchingConstructor() { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); BeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition( - ClassArrayFactoryMethodSampleWithAnotherFactoryMethod.class.getName()) + ClassArrayFactoryMethodSampleWithAnotherFactoryMethod.class.getName()) .setFactoryMethod("of").addConstructorArgValue("test1") .getBeanDefinition(); Executable executable = resolve(beanFactory, beanDefinition); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java index 85ad9ed1b8b..1e3d2173e78 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java @@ -86,7 +86,7 @@ class DefaultBeanRegistrationCodeFragmentsTests { RegisteredBean registeredBean = registerTestBean(SimpleBean.class); assertThat(createInstance(registeredBean).getTarget(registeredBean, PrivilegedTestBeanFactoryBean.class.getDeclaredConstructors()[0])).isEqualTo( - PrivilegedTestBeanFactoryBean.class); + PrivilegedTestBeanFactoryBean.class); } @Test diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/EnumWithClassBody.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/EnumWithClassBody.java index f7d702c36b3..a8064b97ace 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/EnumWithClassBody.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/EnumWithClassBody.java @@ -32,7 +32,6 @@ public enum EnumWithClassBody { * With class body. */ TWO { - @Override public String toString() { return "2"; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java index eead8cac352..e00d3a7792c 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java @@ -147,8 +147,7 @@ class InstanceSupplierCodeGeneratorTests { compile(beanFactory, beanDefinition, (instanceSupplier, compiled) -> { NumberHolder bean = getBean(beanFactory, beanDefinition, instanceSupplier); assertThat(bean).isInstanceOf(NumberHolder.class); - assertThat(bean).extracting("number").isNull(); // No property - // actually set + assertThat(bean).extracting("number").isNull(); // No property actually set assertThat(compiled.getSourceFile()).contains("NumberHolderFactoryBean::new"); }); assertThat(getReflectionHints().getTypeHint(NumberHolderFactoryBean.class))