Skip to content

Commit 8cfdaaa

Browse files
committed
Merge branch '6.1.x'
2 parents 6de624d + f2b3263 commit 8cfdaaa

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,9 @@ public CodeBlock generateSetBeanDefinitionPropertiesCode(
135135
}
136136

137137
@Override
138-
public CodeBlock generateInstanceSupplierCode(GenerationContext generationContext,
139-
BeanRegistrationCode beanRegistrationCode, boolean allowDirectSupplierShortcut) {
138+
public CodeBlock generateInstanceSupplierCode(
139+
GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode,
140+
boolean allowDirectSupplierShortcut) {
140141

141142
GeneratedMethod generatedMethod = beanRegistrationCode.getMethods()
142143
.add("getScopedProxyInstance", method -> {

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ private Class<?> extractDeclaringClass(RegisteredBean registeredBean, Instantiat
101101
/**
102102
* Extract the target class of a public {@link FactoryBean} based on its
103103
* constructor. If the implementation does not resolve the target class
104-
* because it itself uses a generic, attempt to extract it from the
105-
* bean type.
104+
* because it itself uses a generic, attempt to extract it from the bean type.
106105
* @param factoryBeanType the factory bean type
107106
* @param beanType the bean type
108107
* @return the target class to use
@@ -169,9 +168,11 @@ public CodeBlock generateSetBeanDefinitionPropertiesCode(
169168

170169
Loader loader = AotServices.factories(this.registeredBean.getBeanFactory().getBeanClassLoader());
171170
List<Delegate> additionalDelegates = loader.load(Delegate.class).asList();
172-
return new BeanDefinitionPropertiesCodeGenerator(generationContext.getRuntimeHints(),
173-
attributeFilter, beanRegistrationCode.getMethods(),
174-
additionalDelegates, (name, value) -> generateValueCode(generationContext, name, value))
171+
172+
return new BeanDefinitionPropertiesCodeGenerator(
173+
generationContext.getRuntimeHints(), attributeFilter,
174+
beanRegistrationCode.getMethods(), additionalDelegates,
175+
(name, value) -> generateValueCode(generationContext, name, value))
175176
.generateCode(beanDefinition);
176177
}
177178

@@ -230,8 +231,8 @@ public CodeBlock generateInstanceSupplierCode(
230231
if (hasInstanceSupplier()) {
231232
throw new AotBeanProcessingException(this.registeredBean, "instance supplier is not supported");
232233
}
233-
return new InstanceSupplierCodeGenerator(generationContext, beanRegistrationCode.getClassName(),
234-
beanRegistrationCode.getMethods(), allowDirectSupplierShortcut)
234+
return new InstanceSupplierCodeGenerator(generationContext,
235+
beanRegistrationCode.getClassName(), beanRegistrationCode.getMethods(), allowDirectSupplierShortcut)
235236
.generateCode(this.registeredBean, this.instantiationDescriptor.get());
236237
}
237238

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -761,12 +761,7 @@ private CodeBlock generatePropertySourceDescriptorCode(PropertySourceDescriptor
761761
}
762762

763763
private CodeBlock handleNull(@Nullable Object value, Supplier<CodeBlock> nonNull) {
764-
if (value == null) {
765-
return CodeBlock.of("null");
766-
}
767-
else {
768-
return nonNull.get();
769-
}
764+
return (value == null ? CodeBlock.of("null") : nonNull.get());
770765
}
771766
}
772767

@@ -786,9 +781,9 @@ public ConfigurationClassProxyBeanRegistrationCodeFragments(
786781
}
787782

788783
@Override
789-
public CodeBlock generateSetBeanDefinitionPropertiesCode(GenerationContext generationContext,
790-
BeanRegistrationCode beanRegistrationCode, RootBeanDefinition beanDefinition,
791-
Predicate<String> attributeFilter) {
784+
public CodeBlock generateSetBeanDefinitionPropertiesCode(
785+
GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode,
786+
RootBeanDefinition beanDefinition, Predicate<String> attributeFilter) {
792787

793788
CodeBlock.Builder code = CodeBlock.builder();
794789
code.add(super.generateSetBeanDefinitionPropertiesCode(generationContext,
@@ -799,11 +794,13 @@ public CodeBlock generateSetBeanDefinitionPropertiesCode(GenerationContext gener
799794
}
800795

801796
@Override
802-
public CodeBlock generateInstanceSupplierCode(GenerationContext generationContext,
803-
BeanRegistrationCode beanRegistrationCode, boolean allowDirectSupplierShortcut) {
797+
public CodeBlock generateInstanceSupplierCode(
798+
GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode,
799+
boolean allowDirectSupplierShortcut) {
804800

805801
InstantiationDescriptor instantiationDescriptor = proxyInstantiationDescriptor(
806802
generationContext.getRuntimeHints(), this.registeredBean.resolveInstantiationDescriptor());
803+
807804
return new InstanceSupplierCodeGenerator(generationContext,
808805
beanRegistrationCode.getClassName(), beanRegistrationCode.getMethods(), allowDirectSupplierShortcut)
809806
.generateCode(this.registeredBean, instantiationDescriptor);

0 commit comments

Comments
 (0)