(Re)suppress deprecation warnings

See gh-33780
spring-projects · Oct 30, 2024 · f427ac3 · f427ac3
1 parent 79cf554
commit f427ac3
Show file tree

Hide file tree

Showing 23 changed files with 48 additions and 48 deletions.
diff --git a/...ort/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java b/...ort/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
@@ -47,7 +47,7 @@
  * @see org.springframework.core.task.TaskExecutor
  * @see SchedulerFactoryBean#setTaskExecutor
  */
-@SuppressWarnings("removal")
+@SuppressWarnings({"deprecation", "removal"})
 public class SimpleThreadPoolTaskExecutor extends SimpleThreadPool
 		implements AsyncListenableTaskExecutor, SchedulingTaskExecutor, InitializingBean, DisposableBean {
 

diff --git a/...ext/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java b/...ext/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java
@@ -310,7 +310,7 @@ protected Object[] resolveArguments(ApplicationEvent event) {
 		return new Object[] {event};
 	}
 
-	@SuppressWarnings({"removal", "unchecked"})
+	@SuppressWarnings({"removal", "unchecked", "deprecation"})
 	protected void handleResult(Object result) {
 		if (reactiveStreamsPresent && new ReactiveResultHandler().subscribeToPublisher(result)) {
 			if (logger.isTraceEnabled()) {

diff --git a/...ntext/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/...ntext/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
@@ -62,7 +62,7 @@
  * @see DefaultManagedTaskExecutor
  * @see ThreadPoolTaskExecutor
  */
-@SuppressWarnings("removal")
+@SuppressWarnings({"deprecation", "removal"})
 public class ConcurrentTaskExecutor implements AsyncListenableTaskExecutor, SchedulingTaskExecutor {
 
 	private static final Executor STUB_EXECUTOR = (task -> {

diff --git a/...text/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/...text/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
@@ -218,13 +218,13 @@ public <T> Future<T> submit(Callable<T> task) {
 		return super.submit(new DelegatingErrorHandlingCallable<>(task, this.errorHandler));
 	}
 
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	@Override
 	public org.springframework.util.concurrent.ListenableFuture<?> submitListenable(Runnable task) {
 		return super.submitListenable(TaskUtils.decorateTaskWithErrorHandler(task, this.errorHandler, false));
 	}
 
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	@Override
 	public <T> org.springframework.util.concurrent.ListenableFuture<T> submitListenable(Callable<T> task) {
 		return super.submitListenable(new DelegatingErrorHandlingCallable<>(task, this.errorHandler));

diff --git a/...ext/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java b/...ext/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java
@@ -269,13 +269,13 @@ public <T> Future<T> submit(Callable<T> task) {
 		return super.submit(new DelegatingErrorHandlingCallable<>(task, this.errorHandler));
 	}
 
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	@Override
 	public org.springframework.util.concurrent.ListenableFuture<?> submitListenable(Runnable task) {
 		return super.submitListenable(TaskUtils.decorateTaskWithErrorHandler(task, this.errorHandler, false));
 	}
 
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	@Override
 	public <T> org.springframework.util.concurrent.ListenableFuture<T> submitListenable(Callable<T> task) {
 		return super.submitListenable(new DelegatingErrorHandlingCallable<>(task, this.errorHandler));

diff --git a/...ntext/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/...ntext/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
@@ -80,7 +80,7 @@
  * @see ThreadPoolExecutorFactoryBean
  * @see ConcurrentTaskExecutor
  */
-@SuppressWarnings({"serial", "removal"})
+@SuppressWarnings({"serial", "deprecation", "removal"})
 public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport
 		implements AsyncListenableTaskExecutor, SchedulingTaskExecutor {
 

diff --git a/...text/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/...text/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
@@ -74,7 +74,7 @@
  * @see ThreadPoolTaskExecutor
  * @see SimpleAsyncTaskScheduler
  */
-@SuppressWarnings({"serial", "removal"})
+@SuppressWarnings({"serial", "deprecation", "removal"})
 public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 		implements AsyncListenableTaskExecutor, SchedulingTaskExecutor, TaskScheduler {
 

diff --git a/...t/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java b/...t/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
@@ -280,7 +280,7 @@ void collectionReplyNullValue() {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	void listenableFutureReply() {
 		load(TestEventListener.class, ReplyEventListener.class);
 		org.springframework.util.concurrent.SettableListenableFuture<String> future =

diff --git a/...java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java b/...java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
@@ -275,7 +275,7 @@ private interface ITestBean {
 
 		Future<Object> failWithFuture();
 
-		@SuppressWarnings("deprecation")
+		@SuppressWarnings({"deprecation", "removal"})
 		org.springframework.util.concurrent.ListenableFuture<Object> failWithListenableFuture();
 
 		void failWithVoid();
@@ -310,7 +310,7 @@ public Future<Object> failWithFuture() {
 
 		@Async
 		@Override
-		@SuppressWarnings("deprecation")
+		@SuppressWarnings({"deprecation", "removal"})
 		public org.springframework.util.concurrent.ListenableFuture<Object> failWithListenableFuture() {
 			throw new UnsupportedOperationException("failWithListenableFuture");
 		}

diff --git a/...-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java b/...-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
@@ -51,7 +51,7 @@
  * @author Juergen Hoeller
  * @author Chris Beams
  */
-@SuppressWarnings({ "resource", "deprecation" })
+@SuppressWarnings({"resource", "deprecation", "removal"})
 class AsyncExecutionTests {
 
 	private static String originalThreadName;

diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncResultTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncResultTests.java
@@ -32,7 +32,7 @@
 class AsyncResultTests {
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({ "deprecation", "removal" })
 	public void asyncResultWithCallbackAndValue() throws Exception {
 		String value = "val";
 		final Set<String> values = new HashSet<>(1);
@@ -54,7 +54,7 @@ public void onFailure(Throwable ex) {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({ "deprecation", "removal" })
 	public void asyncResultWithCallbackAndException() {
 		IOException ex = new IOException();
 		final Set<Throwable> values = new HashSet<>(1);
@@ -71,15 +71,15 @@ public void onFailure(Throwable ex) {
 		});
 		assertThat(values).singleElement().isSameAs(ex);
 		assertThatExceptionOfType(ExecutionException.class)
-			.isThrownBy(future::get)
-			.withCause(ex);
+				.isThrownBy(future::get)
+				.withCause(ex);
 		assertThatExceptionOfType(ExecutionException.class)
-			.isThrownBy(future.completable()::get)
-			.withCause(ex);
+				.isThrownBy(future.completable()::get)
+				.withCause(ex);
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({ "deprecation", "removal" })
 	public void asyncResultWithSeparateCallbacksAndValue() throws Exception {
 		String value = "val";
 		final Set<String> values = new HashSet<>(1);
@@ -92,19 +92,19 @@ public void asyncResultWithSeparateCallbacksAndValue() throws Exception {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({ "deprecation", "removal" })
 	public void asyncResultWithSeparateCallbacksAndException() {
 		IOException ex = new IOException();
 		final Set<Throwable> values = new HashSet<>(1);
 		org.springframework.util.concurrent.ListenableFuture<String> future = AsyncResult.forExecutionException(ex);
 		future.addCallback(result -> new AssertionError("Success callback not expected: " + result), values::add);
 		assertThat(values).singleElement().isSameAs(ex);
 		assertThatExceptionOfType(ExecutionException.class)
-			.isThrownBy(future::get)
-			.withCause(ex);
+				.isThrownBy(future::get)
+				.withCause(ex);
 		assertThatExceptionOfType(ExecutionException.class)
-			.isThrownBy(future.completable()::get)
-			.withCause(ex);
+				.isThrownBy(future.completable()::get)
+				.withCause(ex);
 	}
 
 }
diff --git a/...t/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java b/...t/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java
@@ -125,7 +125,7 @@ void submitRunnableWithGetAfterShutdown() throws Exception {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({ "deprecation", "removal" })
 	void submitListenableRunnable() {
 		TestTask task = new TestTask(this.testName, 1);
 		// Act
@@ -156,7 +156,7 @@ void submitCompletableRunnable() {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({ "deprecation", "removal" })
 	void submitFailingListenableRunnable() {
 		TestTask task = new TestTask(this.testName, 0);
 		org.springframework.util.concurrent.ListenableFuture<?> future = executor.submitListenable(task);
@@ -185,7 +185,7 @@ void submitFailingCompletableRunnable() {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({ "deprecation", "removal" })
 	void submitListenableRunnableWithGetAfterShutdown() throws Exception {
 		org.springframework.util.concurrent.ListenableFuture<?> future1 = executor.submitListenable(new TestTask(this.testName, -1));
 		org.springframework.util.concurrent.ListenableFuture<?> future2 = executor.submitListenable(new TestTask(this.testName, -1));
@@ -260,7 +260,7 @@ void submitCallableWithGetAfterShutdown() throws Exception {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({ "deprecation", "removal" })
 	void submitListenableCallable() {
 		TestCallable task = new TestCallable(this.testName, 1);
 		// Act
@@ -275,7 +275,7 @@ void submitListenableCallable() {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({ "deprecation", "removal" })
 	void submitFailingListenableCallable() {
 		TestCallable task = new TestCallable(this.testName, 0);
 		// Act
@@ -291,7 +291,7 @@ void submitFailingListenableCallable() {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({ "deprecation", "removal" })
 	void submitListenableCallableWithGetAfterShutdown() throws Exception {
 		org.springframework.util.concurrent.ListenableFuture<?> future1 = executor.submitListenable(new TestCallable(this.testName, -1));
 		org.springframework.util.concurrent.ListenableFuture<?> future2 = executor.submitListenable(new TestCallable(this.testName, -1));

diff --git a/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java
@@ -43,7 +43,7 @@
  * @see java.util.concurrent.ExecutorService
  * @see java.util.concurrent.Executors
  */
-@SuppressWarnings("removal")
+@SuppressWarnings({"deprecation", "removal"})
 public class TaskExecutorAdapter implements AsyncListenableTaskExecutor {
 
 	private final Executor concurrentExecutor;

diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java
@@ -33,7 +33,7 @@
  * @author Arjen Poutsma
  * @author Sebastien Deleuze
  */
-@SuppressWarnings("removal")
+@SuppressWarnings({"deprecation", "removal"})
 class ListenableFutureTaskTests {
 
 	@Test

diff --git a/...src/test/java/org/springframework/util/concurrent/MonoToListenableFutureAdapterTests.java b/...src/test/java/org/springframework/util/concurrent/MonoToListenableFutureAdapterTests.java
@@ -30,7 +30,7 @@
  *
  * @author Rossen Stoyanchev
  */
-@SuppressWarnings("removal")
+@SuppressWarnings({"deprecation", "removal"})
 class MonoToListenableFutureAdapterTests {
 
 	@Test

diff --git a/...core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java b/...core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
@@ -36,7 +36,7 @@
  * @author Mattias Severson
  * @author Juergen Hoeller
  */
-@SuppressWarnings("removal")
+@SuppressWarnings({"deprecation", "removal"})
 class SettableListenableFutureTests {
 
 	private final SettableListenableFuture<String> settableListenableFuture = new SettableListenableFuture<>();

diff --git a/...gframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java b/...gframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java
@@ -571,7 +571,7 @@ public void handleFoo() {
 
 	@Controller
 	@MessageMapping("listenable-future")
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	private static class ListenableFutureController {
 
 		org.springframework.util.concurrent.ListenableFutureTask<String> future;

diff --git a/.../test/java/org/springframework/test/web/servlet/samples/client/standalone/AsyncTests.java b/.../test/java/org/springframework/test/web/servlet/samples/client/standalone/AsyncTests.java
@@ -194,7 +194,7 @@ DeferredResult<Person> getDeferredResultWithDelayedError() {
 		}
 
 		@GetMapping(params = "listenableFuture")
-		@SuppressWarnings("deprecation")
+		@SuppressWarnings({ "deprecation", "removal" })
 		org.springframework.util.concurrent.ListenableFuture<Person> getListenableFuture() {
 			org.springframework.util.concurrent.ListenableFutureTask<Person> futureTask =
 					new org.springframework.util.concurrent.ListenableFutureTask<>(() -> new Person("Joe"));

diff --git a/...est/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java b/...est/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
@@ -334,7 +334,7 @@ DeferredResult<Person> getDeferredResultWithDelayedError() {
 		}
 
 		@RequestMapping(params = "listenableFuture")
-		@SuppressWarnings("deprecation")
+		@SuppressWarnings({"deprecation", "removal"})
 		org.springframework.util.concurrent.ListenableFuture<Person> getListenableFuture() {
 			org.springframework.util.concurrent.ListenableFutureTask<Person> futureTask =
 					new org.springframework.util.concurrent.ListenableFutureTask<>(() -> new Person("Joe"));

diff --git a/...ngframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java b/...ngframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java
@@ -37,7 +37,7 @@
  */
 public class DeferredResultMethodReturnValueHandler implements HandlerMethodReturnValueHandler {
 
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		Class<?> type = returnType.getParameterType();
@@ -46,7 +46,7 @@ public boolean supportsReturnType(MethodParameter returnType) {
 				CompletionStage.class.isAssignableFrom(type));
 	}
 
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	@Override
 	public void handleReturnValue(@Nullable Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception {
@@ -75,7 +75,7 @@ else if (returnValue instanceof CompletionStage<?> completionStage) {
 		WebAsyncUtils.getAsyncManager(webRequest).startDeferredResultProcessing(result, mavContainer);
 	}
 
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	private DeferredResult<Object> adaptListenableFuture(org.springframework.util.concurrent.ListenableFuture<?> future) {
 		DeferredResult<Object> result = new DeferredResult<>();
 		future.addCallback(new org.springframework.util.concurrent.ListenableFutureCallback<Object>() {

diff --git a/...ingframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java b/...ingframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java
@@ -63,7 +63,7 @@ void setup() throws Exception {
 
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	public void supportsReturnType() throws Exception {
 		assertThat(this.handler.supportsReturnType(
 				on(TestController.class).resolveReturnType(DeferredResult.class, String.class))).isTrue();
@@ -88,7 +88,7 @@ void deferredResult() throws Exception {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	public void listenableFuture() throws Exception {
 		org.springframework.util.concurrent.SettableListenableFuture<String> future =
 				new org.springframework.util.concurrent.SettableListenableFuture<>();
@@ -109,7 +109,7 @@ void deferredResultWithError() throws Exception {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	public void listenableFutureWithError() throws Exception {
 		org.springframework.util.concurrent.SettableListenableFuture<String> future =
 				new org.springframework.util.concurrent.SettableListenableFuture<>();
@@ -150,7 +150,7 @@ static class TestController {
 
 		DeferredResult<String> handleDeferredResult() { return null; }
 
-		@SuppressWarnings("removal")
+		@SuppressWarnings({"deprecation", "removal"})
 		org.springframework.util.concurrent.ListenableFuture<String> handleListenableFuture() { return null; }
 
 		CompletableFuture<String> handleCompletableFuture() { return null; }

diff --git a/...t/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java b/...t/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java
@@ -147,7 +147,7 @@ public void setFallbackRequest(DefaultTransportRequest fallbackRequest) {
 
 
 	@Deprecated(since = "6.0", forRemoval = true)
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	public void connect(WebSocketHandler handler,
 			org.springframework.util.concurrent.SettableListenableFuture<WebSocketSession> future) {
 
@@ -208,7 +208,7 @@ public String toString() {
 	 * to connect. Also implements {@code Runnable} to handle a scheduled timeout
 	 * callback.
 	 */
-	@SuppressWarnings("removal")
+	@SuppressWarnings({"deprecation", "removal"})
 	private class ListenableConnectCallback implements
 			org.springframework.util.concurrent.ListenableFutureCallback<WebSocketSession>, Runnable {
 

diff --git a/...bsocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java b/...bsocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java
@@ -84,7 +84,7 @@ void sendMessageError() {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings({"deprecation", "removal"})
 	void connect() {
 		HttpHeaders handshakeHeaders = new HttpHeaders();
 		handshakeHeaders.setOrigin("foo");