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

Remove use of deprecated ChannelInterceptorAdapter

Browse Source 
Deprecated in favor of default methods on `ChannelInterceptor`.

* Fix race in RouterConcurrencyTest; no assertion on executor shutdown; increase time.

# Conflicts:
#	spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests.java
This commit is contained in:
Gary Russell
2018-05-24 15:11:11 -04:00
committed by Artem Bilan
parent 8e1dbdf4c6
commit 62e46c96fc
24 changed files with 97 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-integration-stomp/src/test/java/org/springframework/integration/stomp/outbound/StompMessageHandlerWebSocketIntegrationTests.java
View File

@@ -70,7 +70,7 @@ import org.springframework.messaging.simp.config.ChannelRegistration;
import org.springframework.messaging.simp.config.MessageBrokerRegistry;
import org.springframework.messaging.simp.stomp.StompCommand;
import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
import org.springframework.messaging.support.ChannelInterceptorAdapter;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.stereotype.Controller;
@@ -215,7 +215,6 @@ public class StompMessageHandlerWebSocketIntegrationTests {
}
@Bean
@SuppressWarnings("unchecked")
public ApplicationListener<ApplicationEvent> stompEventListener() {
ApplicationEventListeningMessageProducer producer = new ApplicationEventListeningMessageProducer();
producer.setEventTypes(StompIntegrationEvent.class);
@@ -273,7 +272,7 @@ public class StompMessageHandlerWebSocketIntegrationTests {
@Override
public void configureClientInboundChannel(ChannelRegistration registration) {
registration.interceptors(new ChannelInterceptorAdapter() {
registration.interceptors(new ChannelInterceptor() {
private final AtomicBoolean invoked = new AtomicBoolean();
@@ -281,7 +280,7 @@ public class StompMessageHandlerWebSocketIntegrationTests {
public Message<?> preSend(Message<?> message, MessageChannel channel) {
if (StompCommand.CONNECT.equals(StompHeaderAccessor.wrap(message).getCommand()) ||
this.invoked.compareAndSet(false, true)) {
return super.preSend(message, channel);
return message;
}
throw new RuntimeException("preSend intentional Exception");
}