From 7137b22e6b4296bb2b4faf6e6bd76e817a47fe96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Mon, 26 Jun 2023 12:03:07 +0200 Subject: [PATCH] Fix test compilation warnings Closes gh-30753 --- spring-aop/spring-aop.gradle | 1 + spring-beans/spring-beans.gradle | 1 + .../springframework/beans/AbstractPropertyAccessorTests.java | 2 +- .../beans/factory/DefaultListableBeanFactoryTests.java | 4 +--- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-aop/spring-aop.gradle b/spring-aop/spring-aop.gradle index 87a99985022..80401388470 100644 --- a/spring-aop/spring-aop.gradle +++ b/spring-aop/spring-aop.gradle @@ -10,4 +10,5 @@ dependencies { testImplementation(testFixtures(project(":spring-core"))) testFixturesImplementation(testFixtures(project(":spring-beans"))) testFixturesImplementation(testFixtures(project(":spring-core"))) + testFixturesImplementation("com.google.code.findbugs:jsr305") } diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle index 877d28852dc..93af8f50c73 100644 --- a/spring-beans/spring-beans.gradle +++ b/spring-beans/spring-beans.gradle @@ -14,4 +14,5 @@ dependencies { testImplementation("jakarta.annotation:jakarta.annotation-api") testFixturesApi("org.junit.jupiter:junit-jupiter-api") testFixturesImplementation("org.assertj:assertj-core") + testFixturesImplementation("com.google.code.findbugs:jsr305") } \ No newline at end of file diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java index 2b41115f6a5..12c6a73c37e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java @@ -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; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index c01c73a3398..23ff5c11ad2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -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); }