From 6507b09c7ff3a27474150fc96a715084d1bf78a8 Mon Sep 17 00:00:00 2001 From: Muhammad Hewedy Date: Sun, 3 Feb 2019 23:51:48 +0300 Subject: [PATCH] Fix use CompletableFuture in DeferredResultReturnValueHandlerTest See gh-22337 --- .../annotation/DeferredResultReturnValueHandlerTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 872498c6cf..397da63985 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 @@ -96,8 +96,8 @@ public class DeferredResultReturnValueHandlerTests { @Test public void completableFuture() throws Exception { - SettableListenableFuture future = new SettableListenableFuture<>(); - testHandle(future, CompletableFuture.class, () -> future.set("foo"), "foo"); + CompletableFuture future = new CompletableFuture<>(); + testHandle(future, CompletableFuture.class, () -> future.complete("foo"), "foo"); } @Test @@ -115,9 +115,9 @@ public class DeferredResultReturnValueHandlerTests { @Test public void completableFutureWithError() throws Exception { - SettableListenableFuture future = new SettableListenableFuture<>(); + CompletableFuture future = new CompletableFuture<>(); IllegalStateException ex = new IllegalStateException(); - testHandle(future, CompletableFuture.class, () -> future.setException(ex), ex); + testHandle(future, CompletableFuture.class, () -> future.completeExceptionally(ex), ex); }