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

Merge branch '6.0.x'

Browse Source 
# Conflicts:
#	spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
#	spring-core/src/main/java/org/springframework/core/ResolvableType.java
#	spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
This commit is contained in:
Juergen Hoeller
2023-10-24 22:58:31 +02:00
parent d23263619a 925fa0272b
commit 93b0b66735
7 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
View File

@@ -360,7 +360,7 @@ class ResolvableTypeTests {
ResolvableType type = ResolvableType.forField(field);
assertThat(type.isArray()).isTrue();
assertThat(type.getComponentType().getType())
.isEqualTo(((Class) field.getGenericType()).componentType());
.isEqualTo(((Class) field.getGenericType()).componentType());
}
@Test