From d01d95118bd89b121c51b22d4f73986b56c673b8 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 6 May 2013 21:29:49 +0200 Subject: [PATCH] Stop suppressing warnings for deleted deprecations This commit removes the use of @SuppressWarnings("deprecation") for code in the spring-test module that no longer references deprecated code. Issue: SPR-10499 --- .../junit4/AbstractTransactionalJUnit4SpringContextTests.java | 1 - .../testng/AbstractTransactionalTestNGSpringContextTests.java | 1 - .../context/transaction/TransactionalTestExecutionListener.java | 1 - .../junit4/ConcreteTransactionalJUnit4SpringContextTests.java | 1 - .../test/context/junit4/ExpectedExceptionSpringRunnerTests.java | 1 - .../test/context/junit4/TimedTransactionalSpringRunnerTests.java | 1 - .../AnnotationConfigTransactionalTestNGSpringContextTests.java | 1 - .../testng/ConcreteTransactionalTestNGSpringContextTests.java | 1 - .../DirtiesContextTransactionalTestNGSpringContextTests.java | 1 - 9 files changed, 9 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java index f97ce922b2..335497aa51 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java @@ -73,7 +73,6 @@ import org.springframework.transaction.annotation.Transactional; */ @TestExecutionListeners(TransactionalTestExecutionListener.class) @Transactional -@SuppressWarnings("deprecation") public abstract class AbstractTransactionalJUnit4SpringContextTests extends AbstractJUnit4SpringContextTests { /** diff --git a/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java index aefad7a220..c5d7a6770b 100644 --- a/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java @@ -64,7 +64,6 @@ import org.springframework.transaction.annotation.Transactional; */ @TestExecutionListeners(TransactionalTestExecutionListener.class) @Transactional -@SuppressWarnings("deprecation") public abstract class AbstractTransactionalTestNGSpringContextTests extends AbstractTestNGSpringContextTests { /** diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java index 46c9b9fb52..ab96a3ee5c 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java @@ -93,7 +93,6 @@ import org.springframework.util.StringUtils; * @see BeforeTransaction * @see AfterTransaction */ -@SuppressWarnings("deprecation") public class TransactionalTestExecutionListener extends AbstractTestExecutionListener { private static final Log logger = LogFactory.getLog(TransactionalTestExecutionListener.class); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java index 41b8de7eab..3e4ee89867 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java @@ -50,7 +50,6 @@ import org.springframework.transaction.annotation.Transactional; * @author Sam Brannen * @since 2.5 */ -@SuppressWarnings("deprecation") @ContextConfiguration public class ConcreteTransactionalJUnit4SpringContextTests extends AbstractTransactionalJUnit4SpringContextTests implements BeanNameAware, InitializingBean { diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java index daaa1d1631..eabcd841ba 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java @@ -37,7 +37,6 @@ import org.springframework.test.context.TestExecutionListeners; * @author Sam Brannen * @since 3.0 */ -@SuppressWarnings("deprecation") @RunWith(JUnit4.class) public class ExpectedExceptionSpringRunnerTests { diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java index bb3c67af3e..fa5770e275 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java @@ -38,7 +38,6 @@ import org.springframework.transaction.annotation.Transactional; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("transactionalTests-context.xml") @Transactional -@SuppressWarnings("deprecation") public class TimedTransactionalSpringRunnerTests { @Test diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java index 7167ddf6f5..76384ec092 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java @@ -54,7 +54,6 @@ import org.testng.annotations.Test; * @author Sam Brannen * @since 3.1 */ -@SuppressWarnings("deprecation") @ContextConfiguration public class AnnotationConfigTransactionalTestNGSpringContextTests extends AbstractTransactionalTestNGSpringContextTests { diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java index 77ab33b1f0..e93385b9d3 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java @@ -48,7 +48,6 @@ import org.testng.annotations.Test; * @author Sam Brannen * @since 2.5 */ -@SuppressWarnings("deprecation") @ContextConfiguration public class ConcreteTransactionalTestNGSpringContextTests extends AbstractTransactionalTestNGSpringContextTests implements BeanNameAware, InitializingBean { diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java index 771995c71c..d9687f9e48 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java @@ -53,7 +53,6 @@ public class DirtiesContextTransactionalTestNGSpringContextTests extends Abstrac private ApplicationContext dirtiedApplicationContext; - @SuppressWarnings("deprecation") private void performCommonAssertions() { assertInTransaction(true); assertNotNull(super.applicationContext, -- GitLab