Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2023-10-23 17:34:45 +02:00
parent 8457c768e8 6bdf7ad36a
commit cf3a25bfac
7 changed files with 70 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGenerator.java
View File

@@ -70,6 +70,7 @@ class BeanDefinitionPropertyValueCodeGenerator {
BeanDefinitionPropertyValueCodeGenerator(GeneratedMethods generatedMethods,
@Nullable BiFunction<Object, ResolvableType, CodeBlock> customValueGenerator) {
this.generatedMethods = generatedMethods;
this.delegates = new ArrayList<>();
if (customValueGenerator != null) {
@@ -145,7 +146,6 @@ class BeanDefinitionPropertyValueCodeGenerator {
@Nullable
CodeBlock generateCode(Object value, ResolvableType type);
}
@@ -165,7 +165,6 @@ class BeanDefinitionPropertyValueCodeGenerator {
'\\', "\\\\"
);
@Override
@Nullable
public CodeBlock generateCode(Object value, ResolvableType type) {
@@ -233,7 +232,6 @@ class BeanDefinitionPropertyValueCodeGenerator {
}
return null;
}
}
@@ -323,8 +321,8 @@ class BeanDefinitionPropertyValueCodeGenerator {
this.emptyResult = emptyResult;
}
@Override
@SuppressWarnings("unchecked")
@Override
@Nullable
public CodeBlock generateCode(Object value, ResolvableType type) {
if (this.collectionType.isInstance(value)) {