diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java index f6ad049f58d..9ab8c18cfa3 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java @@ -47,7 +47,7 @@ import org.springframework.util.concurrent.ListenableFutureTask; * @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/spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java index 8da15087bf7..e1916d08657 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java +++ b/spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java @@ -310,7 +310,7 @@ public class ApplicationListenerMethodAdapter implements GenericApplicationListe 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/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java index 12da3290727..d4a503d0c18 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java @@ -62,7 +62,7 @@ import org.springframework.util.concurrent.ListenableFuture; * @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/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java index 98c7e81a996..f707d2bcc48 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java @@ -218,13 +218,13 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T 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 org.springframework.util.concurrent.ListenableFuture submitListenable(Callable task) { return super.submitListenable(new DelegatingErrorHandlingCallable<>(task, this.errorHandler)); diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java index 7aed3aaa02e..bb66d4512f1 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java @@ -269,13 +269,13 @@ public class SimpleAsyncTaskScheduler extends SimpleAsyncTaskExecutor implements 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 org.springframework.util.concurrent.ListenableFuture submitListenable(Callable task) { return super.submitListenable(new DelegatingErrorHandlingCallable<>(task, this.errorHandler)); diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java index 3fb627a6ef0..66e54c8fd60 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java @@ -80,7 +80,7 @@ import org.springframework.util.concurrent.ListenableFutureTask; * @see ThreadPoolExecutorFactoryBean * @see ConcurrentTaskExecutor */ -@SuppressWarnings({"serial", "removal"}) +@SuppressWarnings({"serial", "deprecation", "removal"}) public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport implements AsyncListenableTaskExecutor, SchedulingTaskExecutor { diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java index bd143226061..458af46ae74 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java @@ -74,7 +74,7 @@ import org.springframework.util.concurrent.ListenableFutureTask; * @see ThreadPoolTaskExecutor * @see SimpleAsyncTaskScheduler */ -@SuppressWarnings({"serial", "removal"}) +@SuppressWarnings({"serial", "deprecation", "removal"}) public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport implements AsyncListenableTaskExecutor, SchedulingTaskExecutor, TaskScheduler { diff --git a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java index 25879472874..ac511516963 100644 --- a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java @@ -280,7 +280,7 @@ class AnnotationDrivenEventListenerTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({"deprecation", "removal"}) void listenableFutureReply() { load(TestEventListener.class, ReplyEventListener.class); org.springframework.util.concurrent.SettableListenableFuture future = diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java index 9302682f690..3d73ac0bea8 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java @@ -275,7 +275,7 @@ class AsyncAnnotationBeanPostProcessorTests { Future failWithFuture(); - @SuppressWarnings("deprecation") + @SuppressWarnings({"deprecation", "removal"}) org.springframework.util.concurrent.ListenableFuture failWithListenableFuture(); void failWithVoid(); @@ -310,7 +310,7 @@ class AsyncAnnotationBeanPostProcessorTests { @Async @Override - @SuppressWarnings("deprecation") + @SuppressWarnings({"deprecation", "removal"}) public org.springframework.util.concurrent.ListenableFuture failWithListenableFuture() { throw new UnsupportedOperationException("failWithListenableFuture"); } diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java index 074dd0ce971..5be5a1214b5 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java @@ -51,7 +51,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * @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 index 56c2ed42d91..b4ac333da9c 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class AsyncResultTests { @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "deprecation", "removal" }) public void asyncResultWithCallbackAndValue() throws Exception { String value = "val"; final Set values = new HashSet<>(1); @@ -54,7 +54,7 @@ class AsyncResultTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "deprecation", "removal" }) public void asyncResultWithCallbackAndException() { IOException ex = new IOException(); final Set values = new HashSet<>(1); @@ -71,15 +71,15 @@ class AsyncResultTests { }); 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 values = new HashSet<>(1); @@ -92,7 +92,7 @@ class AsyncResultTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "deprecation", "removal" }) public void asyncResultWithSeparateCallbacksAndException() { IOException ex = new IOException(); final Set values = new HashSet<>(1); @@ -100,11 +100,11 @@ class AsyncResultTests { 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/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java index 8d49d5ee91c..e6c01beaaa1 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java @@ -125,7 +125,7 @@ abstract class AbstractSchedulingTaskExecutorTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "deprecation", "removal" }) void submitListenableRunnable() { TestTask task = new TestTask(this.testName, 1); // Act @@ -156,7 +156,7 @@ abstract class AbstractSchedulingTaskExecutorTests { } @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 @@ abstract class AbstractSchedulingTaskExecutorTests { } @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 @@ abstract class AbstractSchedulingTaskExecutorTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "deprecation", "removal" }) void submitListenableCallable() { TestCallable task = new TestCallable(this.testName, 1); // Act @@ -275,7 +275,7 @@ abstract class AbstractSchedulingTaskExecutorTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "deprecation", "removal" }) void submitFailingListenableCallable() { TestCallable task = new TestCallable(this.testName, 0); // Act @@ -291,7 +291,7 @@ abstract class AbstractSchedulingTaskExecutorTests { } @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 index 02916ab6037..0669f7ea7c8 100644 --- 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 @@ import org.springframework.util.concurrent.ListenableFutureTask; * @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 index 04c4f562331..920b5ebd448 100644 --- 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 @@ import static org.mockito.Mockito.verifyNoInteractions; * @author Arjen Poutsma * @author Sebastien Deleuze */ -@SuppressWarnings("removal") +@SuppressWarnings({"deprecation", "removal"}) class ListenableFutureTaskTests { @Test diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/MonoToListenableFutureAdapterTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/MonoToListenableFutureAdapterTests.java index a0f019478fd..5b7a139f840 100644 --- a/spring-core/src/test/java/org/springframework/util/concurrent/MonoToListenableFutureAdapterTests.java +++ b/spring-core/src/test/java/org/springframework/util/concurrent/MonoToListenableFutureAdapterTests.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Rossen Stoyanchev */ -@SuppressWarnings("removal") +@SuppressWarnings({"deprecation", "removal"}) class MonoToListenableFutureAdapterTests { @Test diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java index ca2d4ffb8de..d79296dd099 100644 --- a/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java +++ b/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @author Mattias Severson * @author Juergen Hoeller */ -@SuppressWarnings("removal") +@SuppressWarnings({"deprecation", "removal"}) class SettableListenableFutureTests { private final SettableListenableFuture settableListenableFuture = new SettableListenableFuture<>(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java index 15a7e39d005..532838457aa 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java @@ -571,7 +571,7 @@ public class SimpAnnotationMethodMessageHandlerTests { @Controller @MessageMapping("listenable-future") - @SuppressWarnings("removal") + @SuppressWarnings({"deprecation", "removal"}) private static class ListenableFutureController { org.springframework.util.concurrent.ListenableFutureTask future; diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/AsyncTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/AsyncTests.java index 2de69a305aa..29c8367c945 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/AsyncTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/AsyncTests.java @@ -194,7 +194,7 @@ class AsyncTests { } @GetMapping(params = "listenableFuture") - @SuppressWarnings("deprecation") + @SuppressWarnings({ "deprecation", "removal" }) org.springframework.util.concurrent.ListenableFuture getListenableFuture() { org.springframework.util.concurrent.ListenableFutureTask futureTask = new org.springframework.util.concurrent.ListenableFutureTask<>(() -> new Person("Joe")); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java index cdc64fb5dcb..dd70f74d9b0 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java @@ -334,7 +334,7 @@ class AsyncTests { } @RequestMapping(params = "listenableFuture") - @SuppressWarnings("deprecation") + @SuppressWarnings({"deprecation", "removal"}) org.springframework.util.concurrent.ListenableFuture getListenableFuture() { org.springframework.util.concurrent.ListenableFutureTask futureTask = new org.springframework.util.concurrent.ListenableFutureTask<>(() -> new Person("Joe")); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java index 3d77f00df1c..8cecbbdd657 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java @@ -37,7 +37,7 @@ import org.springframework.web.method.support.ModelAndViewContainer; */ 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 class DeferredResultMethodReturnValueHandler implements HandlerMethodRetu 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 @@ public class DeferredResultMethodReturnValueHandler implements HandlerMethodRetu WebAsyncUtils.getAsyncManager(webRequest).startDeferredResultProcessing(result, mavContainer); } - @SuppressWarnings("removal") + @SuppressWarnings({"deprecation", "removal"}) private DeferredResult adaptListenableFuture(org.springframework.util.concurrent.ListenableFuture future) { DeferredResult result = new DeferredResult<>(); future.addCallback(new org.springframework.util.concurrent.ListenableFutureCallback() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java index 938d2820397..c925d192d53 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java @@ -63,7 +63,7 @@ class DeferredResultReturnValueHandlerTests { @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 @@ class DeferredResultReturnValueHandlerTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({"deprecation", "removal"}) public void listenableFuture() throws Exception { org.springframework.util.concurrent.SettableListenableFuture future = new org.springframework.util.concurrent.SettableListenableFuture<>(); @@ -109,7 +109,7 @@ class DeferredResultReturnValueHandlerTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({"deprecation", "removal"}) public void listenableFutureWithError() throws Exception { org.springframework.util.concurrent.SettableListenableFuture future = new org.springframework.util.concurrent.SettableListenableFuture<>(); @@ -150,7 +150,7 @@ class DeferredResultReturnValueHandlerTests { DeferredResult handleDeferredResult() { return null; } - @SuppressWarnings("removal") + @SuppressWarnings({"deprecation", "removal"}) org.springframework.util.concurrent.ListenableFuture handleListenableFuture() { return null; } CompletableFuture handleCompletableFuture() { return null; } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java index f0fc1f8e774..cab924b5c81 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java @@ -147,7 +147,7 @@ class DefaultTransportRequest implements TransportRequest { @Deprecated(since = "6.0", forRemoval = true) - @SuppressWarnings("removal") + @SuppressWarnings({"deprecation", "removal"}) public void connect(WebSocketHandler handler, org.springframework.util.concurrent.SettableListenableFuture future) { @@ -208,7 +208,7 @@ class DefaultTransportRequest implements TransportRequest { * 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, Runnable { diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java index d71fd844627..eb9891f6142 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java @@ -84,7 +84,7 @@ class XhrTransportTests { } @Test - @SuppressWarnings("deprecation") + @SuppressWarnings({"deprecation", "removal"}) void connect() { HttpHeaders handshakeHeaders = new HttpHeaders(); handshakeHeaders.setOrigin("foo");