From d115361980ec60d7918ae2db7edbda84889eea2a Mon Sep 17 00:00:00 2001 From: weixsun Date: Thu, 13 May 2021 17:17:10 +0800 Subject: [PATCH] Remove redundant suppression See gh-26448 --- .../autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java | 1 - .../boot/autoconfigure/web/ResourcePropertiesBindingTests.java | 1 - .../autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java | 1 - .../context/ConfigFileApplicationContextInitializerTests.java | 1 - .../boot/jta/atomikos/AtomikosConnectionFactoryBeanTests.java | 1 - .../boot/jta/atomikos/AtomikosDataSourceBeanTests.java | 1 - .../AnnotationConfigServletWebServerApplicationContextTests.java | 1 - .../org/springframework/boot/web/servlet/mock/MockServlet.java | 1 - .../data/couchbase/SampleCouchbaseApplicationTests.java | 1 - .../smoketest/liquibase/SampleLiquibaseApplicationTests.java | 1 - 10 files changed, 10 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java index 01dc64b30ce..64408fb98e4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java @@ -420,7 +420,6 @@ abstract class AbstractJpaAutoConfigurationTests { } - @SuppressWarnings("serial") static class CustomJpaTransactionManager extends JpaTransactionManager { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesBindingTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesBindingTests.java index 0f269586c59..d78f9041aa2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesBindingTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesBindingTests.java @@ -61,7 +61,6 @@ class ResourcePropertiesBindingTests { }; } - @SuppressWarnings("deprecation") @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(ResourceProperties.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java index 5de65c40beb..923f23628ce 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java @@ -847,7 +847,6 @@ class WebMvcAutoConfigurationTests { @Test @Deprecated - @SuppressWarnings("deprecation") void useSuffixPatternMatch() { this.contextRunner.withPropertyValues("spring.mvc.pathmatch.use-suffix-pattern:true", "spring.mvc.pathmatch.use-registered-suffix-pattern:true").run((context) -> { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java index 94428390930..d94f6549b0a 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java @@ -34,7 +34,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Phillip Webb */ @Deprecated -@SuppressWarnings("deprecation") @ExtendWith(SpringExtension.class) @DirtiesContext @ContextConfiguration(classes = ConfigFileApplicationContextInitializerTests.Config.class, diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosConnectionFactoryBeanTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosConnectionFactoryBeanTests.java index 88255307c35..7c790e9c126 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosConnectionFactoryBeanTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosConnectionFactoryBeanTests.java @@ -42,7 +42,6 @@ class AtomikosConnectionFactoryBeanTests { verify(bean).close(); } - @SuppressWarnings("serial") static class MockAtomikosConnectionFactoryBean extends AtomikosConnectionFactoryBean { @Override diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDataSourceBeanTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDataSourceBeanTests.java index e291f0ed5b8..522da6c472c 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDataSourceBeanTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDataSourceBeanTests.java @@ -42,7 +42,6 @@ class AtomikosDataSourceBeanTests { verify(bean).close(); } - @SuppressWarnings("serial") static class MockAtomikosDataSourceBean extends AtomikosDataSourceBean { @Override diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContextTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContextTests.java index 1d03f856c5b..a1f4e494459 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContextTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContextTests.java @@ -142,7 +142,6 @@ class AnnotationConfigServletWebServerApplicationContextTests { } @Component - @SuppressWarnings("serial") static class ExampleServletWithAutowired extends GenericServlet { @Autowired diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/mock/MockServlet.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/mock/MockServlet.java index d457a79b369..54c1f6af248 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/mock/MockServlet.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/mock/MockServlet.java @@ -28,7 +28,6 @@ import javax.servlet.ServletResponse; * * @author Phillip Webb */ -@SuppressWarnings("serial") public class MockServlet extends GenericServlet { @Override diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationTests.java index 033ba394f2a..956dd6666a3 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationTests.java @@ -44,7 +44,6 @@ class SampleCouchbaseApplicationTests { } private boolean serverNotRunning(RuntimeException ex) { - @SuppressWarnings("serial") NestedCheckedException nested = new NestedCheckedException("failed", ex) { }; if (nested.contains(FeatureNotAvailableException.class)) { diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java index 66aad00a25b..f7fe459d773 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java @@ -67,7 +67,6 @@ class SampleLiquibaseApplicationTests { .contains("Successfully released change log lock"); } - @SuppressWarnings("serial") private boolean serverNotRunning(IllegalStateException ex) { NestedCheckedException nested = new NestedCheckedException("failed", ex) { };