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:
Sébastien Deleuze
2023-06-26 12:03:40 +02:00
parent 6072a537d9 7137b22e6b
commit 66b27e6dc8
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
View File

@@ -1994,6 +1994,7 @@ abstract class AbstractPropertyAccessorTests {
}
@SuppressWarnings("unchecked")
static class Spr13837Bean implements Spr13837 {
protected Integer something;
@@ -2004,7 +2005,6 @@ abstract class AbstractPropertyAccessorTests {
}
@Override
@SuppressWarnings("unchecked")
public Spr13837Bean setSomething(final Integer something) {
this.something = something;
return this;

4
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@@ -3190,6 +3190,7 @@ class DefaultListableBeanFactoryTests {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
private static class CustomTypeConverter implements TypeConverter {
private final NumberFormat numberFormat;
@@ -3199,7 +3200,6 @@ class DefaultListableBeanFactoryTests {
}
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Object convertIfNecessary(Object value, @Nullable Class requiredType) {
if (value instanceof String && Float.class.isAssignableFrom(requiredType)) {
try {
@@ -3218,13 +3218,11 @@ class DefaultListableBeanFactoryTests {
}
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Object convertIfNecessary(Object value, @Nullable Class requiredType, @Nullable MethodParameter methodParam) {
return convertIfNecessary(value, requiredType);
}
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Object convertIfNecessary(Object value, @Nullable Class requiredType, @Nullable Field field) {
return convertIfNecessary(value, requiredType);
}