Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistently support CompletionStage next to CompletableFuture

Browse Source 
Issue: SPR-15258
(cherry picked from commit 50d93d3)
This commit is contained in:
Juergen Hoeller
2017-02-15 23:16:11 +01:00
parent 4d2360e5b5
commit 06231721c3
6 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -270,7 +270,7 @@ public class SimpAnnotationMethodMessageHandlerTests {
this.messageHandler.handleMessage(message);
controller.future.run();
assertTrue(controller.exceptionCatched);
assertTrue(controller.exceptionCaught);
}
@Test
@@ -340,7 +340,6 @@ public class SimpAnnotationMethodMessageHandlerTests {
}
private static class TestSimpAnnotationMethodMessageHandler extends SimpAnnotationMethodMessageHandler {
public TestSimpAnnotationMethodMessageHandler(SimpMessageSendingOperations brokerTemplate,
@@ -434,6 +433,7 @@ public class SimpAnnotationMethodMessageHandlerTests {
}
}
@Controller
@MessageMapping("pre")
private static class DotPathSeparatorController {
@@ -447,12 +447,14 @@ public class SimpAnnotationMethodMessageHandlerTests {
}
}
@Controller
@MessageMapping("listenable-future")
private static class ListenableFutureController {
private ListenableFutureTask<String> future;
private boolean exceptionCatched = false;
private boolean exceptionCaught = false;
@MessageMapping("success")
public ListenableFutureTask<String> handleListenableFuture() {
@@ -470,11 +472,11 @@ public class SimpAnnotationMethodMessageHandlerTests {
@MessageExceptionHandler(IllegalStateException.class)
public void handleValidationException() {
this.exceptionCatched = true;
this.exceptionCaught = true;
}
}
@Controller
private static class CompletableFutureController {
@@ -492,14 +494,14 @@ public class SimpAnnotationMethodMessageHandlerTests {
public void handleValidationException() {
this.exceptionCaught = true;
}
}
private static class StringTestValidator implements Validator {
private final String invalidValue;
private StringTestValidator(String invalidValue) {
public StringTestValidator(String invalidValue) {
this.invalidValue = invalidValue;
}