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

3
spring-integration-core/src/main/java/org/springframework/integration/dsl/StandardIntegrationFlow.java
View File

@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.context.SmartLifecycle;
import org.springframework.integration.support.management.ManageableSmartLifecycle;
import org.springframework.messaging.MessageChannel;
/**
@@ -66,7 +65,7 @@ import org.springframework.messaging.MessageChannel;
* @see org.springframework.integration.dsl.context.IntegrationFlowContext
* @see SmartLifecycle
*/
public class StandardIntegrationFlow implements IntegrationFlow, ManageableSmartLifecycle {
public class StandardIntegrationFlow implements IntegrationFlow, SmartLifecycle {
private final Map<Object, String> integrationComponents;

4
spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/AbstractRSocketConnector.java
View File

@@ -22,7 +22,7 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.SmartInitializingSingleton;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.integration.support.management.ManageableSmartLifecycle;
import org.springframework.context.SmartLifecycle;
import org.springframework.lang.Nullable;
import org.springframework.messaging.rsocket.RSocketStrategies;
import org.springframework.util.Assert;
@@ -43,7 +43,7 @@ import org.springframework.util.MimeType;
*/
public abstract class AbstractRSocketConnector
implements ApplicationContextAware, InitializingBean, DisposableBean, SmartInitializingSingleton,
ManageableSmartLifecycle {
SmartLifecycle {
protected final IntegrationRSocketMessageHandler rSocketMessageHandler; // NOSONAR - final

4
spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java
View File

@@ -32,9 +32,9 @@ import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.context.SmartLifecycle;
import org.springframework.integration.stomp.event.StompConnectionFailedEvent;
import org.springframework.integration.stomp.event.StompSessionConnectedEvent;
import org.springframework.integration.support.management.ManageableSmartLifecycle;
import org.springframework.lang.Nullable;
import org.springframework.messaging.simp.stomp.StompClientSupport;
import org.springframework.messaging.simp.stomp.StompCommand;
@@ -69,7 +69,7 @@ import org.springframework.util.concurrent.ListenableFutureCallback;
* @since 4.2
*/
public abstract class AbstractStompSessionManager implements StompSessionManager, ApplicationEventPublisherAware,
ManageableSmartLifecycle, DisposableBean, BeanNameAware {
SmartLifecycle, DisposableBean, BeanNameAware {
private static final long DEFAULT_RECOVERY_INTERVAL = 10000;

3
spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java
View File

@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import org.apache.activemq.broker.BrokerService;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.context.ApplicationEvent;
@@ -63,7 +62,7 @@ import org.springframework.util.SocketUtils;
*
* @since 4.2
*/
@Disabled("Until the fix in reactor-netty-core")
//@Disabled("Until the fix in reactor-netty-core")
public class StompServerIntegrationTests {
private static BrokerService activeMQBroker;

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;

4
spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java
View File

@@ -26,7 +26,7 @@ import org.jxmpp.util.XmppStringUtils;
import org.springframework.beans.factory.BeanInitializationException;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.integration.support.management.ManageableSmartLifecycle;
import org.springframework.context.SmartLifecycle;
import org.springframework.util.StringUtils;
/**
@@ -45,7 +45,7 @@ import org.springframework.util.StringUtils;
*
* @see XMPPTCPConnection
*/
public class XmppConnectionFactoryBean extends AbstractFactoryBean<XMPPConnection> implements ManageableSmartLifecycle {
public class XmppConnectionFactoryBean extends AbstractFactoryBean<XMPPConnection> implements SmartLifecycle {
private final Object lifecycleMonitor = new Object();

4
spring-integration-zookeeper/src/main/java/org/springframework/integration/zookeeper/metadata/ZookeeperMetadataStore.java
View File

@@ -31,9 +31,9 @@ import org.apache.curator.utils.CloseableUtils;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
import org.springframework.context.SmartLifecycle;
import org.springframework.integration.metadata.ListenableMetadataStore;
import org.springframework.integration.metadata.MetadataStoreListener;
import org.springframework.integration.support.management.ManageableSmartLifecycle;
import org.springframework.integration.support.utils.IntegrationUtils;
import org.springframework.util.Assert;
@@ -47,7 +47,7 @@ import org.springframework.util.Assert;
*
* @since 4.2
*/
public class ZookeeperMetadataStore implements ListenableMetadataStore, ManageableSmartLifecycle {
public class ZookeeperMetadataStore implements ListenableMetadataStore, SmartLifecycle {
private static final String KEY_MUST_NOT_BE_NULL = "'key' must not be null.";