Polishing

Author: jhoeller

spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessor.java

@@ -134,8 +134,9 @@ public CodeBlock generateSetBeanDefinitionPropertiesCode(
 		}
 
 		@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 -> {

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

@@ -104,8 +104,7 @@ private Class<?> extractDeclaringClass(RegisteredBean registeredBean, Instantiat
 	/**
 	 * 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 @@ public CodeBlock generateSetBeanDefinitionPropertiesCode(
 
 		Loader loader = AotServices.factories(this.registeredBean.getBeanFactory().getBeanClassLoader());
 		List<Delegate> 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 @@ public CodeBlock generateInstanceSupplierCode(
 			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());
 	}
 

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java

@@ -756,12 +756,7 @@ private CodeBlock generatePropertySourceDescriptorCode(PropertySourceDescriptor
 		}
 
 		private CodeBlock handleNull(@Nullable Object value, Supplier<CodeBlock> 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 ConfigurationClassProxyBeanRegistrationCodeFragments(
 		}
 
 		@Override
-		public CodeBlock generateSetBeanDefinitionPropertiesCode(GenerationContext generationContext,
-				BeanRegistrationCode beanRegistrationCode, RootBeanDefinition beanDefinition,
-				Predicate<String> attributeFilter) {
+		public CodeBlock generateSetBeanDefinitionPropertiesCode(
+				GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode,
+				RootBeanDefinition beanDefinition, Predicate<String> attributeFilter) {
 
 			CodeBlock.Builder code = CodeBlock.builder();
 			code.add(super.generateSetBeanDefinitionPropertiesCode(generationContext,
@@ -794,11 +789,13 @@ public CodeBlock generateSetBeanDefinitionPropertiesCode(GenerationContext gener
 		}
 
 		@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);