From f2b3263fff2cb940a5f2ce91babb7731355d9d3b Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 10 Jul 2024 15:56:56 +0200 Subject: [PATCH] Polishing --- ...opedProxyBeanRegistrationAotProcessor.java | 5 +++-- .../DefaultBeanRegistrationCodeFragments.java | 15 ++++++++------- .../ConfigurationClassPostProcessor.java | 19 ++++++++----------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessor.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessor.java index fbd85357fad..830ca6e7f5b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessor.java +++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessor.java @@ -134,8 +134,9 @@ class ScopedProxyBeanRegistrationAotProcessor implements BeanRegistrationAotProc } @Override - public CodeBlock generateInstanceSupplierCode(GenerationContext generationContext, - BeanRegistrationCode beanRegistrationCode, boolean allowDirectSupplierShortcut) { + public CodeBlock generateInstanceSupplierCode( + GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode, + boolean allowDirectSupplierShortcut) { GeneratedMethod generatedMethod = beanRegistrationCode.getMethods() .add("getScopedProxyInstance", method -> { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragments.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragments.java index 8d4691f26f4..57c792af176 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragments.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragments.java @@ -104,8 +104,7 @@ class DefaultBeanRegistrationCodeFragments implements BeanRegistrationCodeFragme /** * Extract the target class of a public {@link FactoryBean} based on its * constructor. If the implementation does not resolve the target class - * because it itself uses a generic, attempt to extract it from the - * bean type. + * because it itself uses a generic, attempt to extract it from the bean type. * @param factoryBeanType the factory bean type * @param beanType the bean type * @return the target class to use @@ -172,9 +171,11 @@ class DefaultBeanRegistrationCodeFragments implements BeanRegistrationCodeFragme Loader loader = AotServices.factories(this.registeredBean.getBeanFactory().getBeanClassLoader()); List additionalDelegates = loader.load(Delegate.class).asList(); - return new BeanDefinitionPropertiesCodeGenerator(generationContext.getRuntimeHints(), - attributeFilter, beanRegistrationCode.getMethods(), - additionalDelegates, (name, value) -> generateValueCode(generationContext, name, value)) + + return new BeanDefinitionPropertiesCodeGenerator( + generationContext.getRuntimeHints(), attributeFilter, + beanRegistrationCode.getMethods(), additionalDelegates, + (name, value) -> generateValueCode(generationContext, name, value)) .generateCode(beanDefinition); } @@ -234,8 +235,8 @@ class DefaultBeanRegistrationCodeFragments implements BeanRegistrationCodeFragme throw new IllegalStateException("Default code generation is not supported for bean definitions " + "declaring an instance supplier callback: " + this.registeredBean.getMergedBeanDefinition()); } - return new InstanceSupplierCodeGenerator(generationContext, beanRegistrationCode.getClassName(), - beanRegistrationCode.getMethods(), allowDirectSupplierShortcut) + return new InstanceSupplierCodeGenerator(generationContext, + beanRegistrationCode.getClassName(), beanRegistrationCode.getMethods(), allowDirectSupplierShortcut) .generateCode(this.registeredBean, this.instantiationDescriptor.get()); } diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java index ce8fd97f05c..8068ddd93cb 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java @@ -756,12 +756,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo } private CodeBlock handleNull(@Nullable Object value, Supplier nonNull) { - if (value == null) { - return CodeBlock.of("null"); - } - else { - return nonNull.get(); - } + return (value == null ? CodeBlock.of("null") : nonNull.get()); } } @@ -781,9 +776,9 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo } @Override - public CodeBlock generateSetBeanDefinitionPropertiesCode(GenerationContext generationContext, - BeanRegistrationCode beanRegistrationCode, RootBeanDefinition beanDefinition, - Predicate attributeFilter) { + public CodeBlock generateSetBeanDefinitionPropertiesCode( + GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode, + RootBeanDefinition beanDefinition, Predicate attributeFilter) { CodeBlock.Builder code = CodeBlock.builder(); code.add(super.generateSetBeanDefinitionPropertiesCode(generationContext, @@ -794,11 +789,13 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo } @Override - public CodeBlock generateInstanceSupplierCode(GenerationContext generationContext, - BeanRegistrationCode beanRegistrationCode, boolean allowDirectSupplierShortcut) { + public CodeBlock generateInstanceSupplierCode( + GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode, + boolean allowDirectSupplierShortcut) { InstantiationDescriptor instantiationDescriptor = proxyInstantiationDescriptor( generationContext.getRuntimeHints(), this.registeredBean.resolveInstantiationDescriptor()); + return new InstanceSupplierCodeGenerator(generationContext, beanRegistrationCode.getClassName(), beanRegistrationCode.getMethods(), allowDirectSupplierShortcut) .generateCode(this.registeredBean, instantiationDescriptor);