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

Enable STOMP test back to check the solution

Browse Source 
* Remove more `ManageableSmartLifecycle` from non-channel adapter components
This commit is contained in:
Artem Bilan
2020-08-09 08:11:15 -04:00
parent 8e5bd4cc80
commit fcf7f761a5
8 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ClientWebSocketContainer.java
View File

@@ -21,8 +21,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.springframework.context.Lifecycle;
import org.springframework.context.SmartLifecycle;
import org.springframework.http.HttpHeaders;
import org.springframework.integration.support.management.ManageableSmartLifecycle;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.util.concurrent.ListenableFuture;
@@ -49,7 +49,7 @@ import org.springframework.web.socket.client.WebSocketClient;
*
* @since 4.1
*/
public final class ClientWebSocketContainer extends IntegrationWebSocketContainer implements ManageableSmartLifecycle {
public final class ClientWebSocketContainer extends IntegrationWebSocketContainer implements SmartLifecycle {
private static final int DEFAULT_CONNECTION_TIMEOUT = 10;

4
spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ServerWebSocketContainer.java
View File

@@ -19,7 +19,7 @@ package org.springframework.integration.websocket;
import java.util.Arrays;
import org.springframework.context.Lifecycle;
import org.springframework.integration.support.management.ManageableSmartLifecycle;
import org.springframework.context.SmartLifecycle;
import org.springframework.integration.util.JavaUtils;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.util.Assert;
@@ -51,7 +51,7 @@ import org.springframework.web.socket.sockjs.transport.TransportHandler;
* @since 4.1
*/
public class ServerWebSocketContainer extends IntegrationWebSocketContainer
implements WebSocketConfigurer, ManageableSmartLifecycle {
implements WebSocketConfigurer, SmartLifecycle {
private final String[] paths;