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

18
spring-integration-jms/src/test/java/org/springframework/integration/jms/PollableJmsChannelTests.java
View File

@@ -51,7 +51,6 @@ import org.springframework.jms.core.JmsTemplate;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.messaging.support.ChannelInterceptorAdapter;
import org.springframework.messaging.support.GenericMessage;
/**
@@ -248,7 +247,7 @@ public class PollableJmsChannelTests extends ActiveMQMultiContextTests {
assertEquals("bar", result2.getPayload());
}
public static class SampleInterceptor extends ChannelInterceptorAdapter {
public static class SampleInterceptor implements ChannelInterceptor {
private final boolean preReceiveFlag;
@@ -256,26 +255,11 @@ public class PollableJmsChannelTests extends ActiveMQMultiContextTests {
this.preReceiveFlag = preReceiveFlag;
}
@Override
public Message<?> preSend(Message<?> message, MessageChannel channel) {
return message;
}
@Override
public void postSend(Message<?> message, MessageChannel channel,
boolean sent) {
}
@Override
public boolean preReceive(MessageChannel channel) {
return this.preReceiveFlag;
}
@Override
public Message<?> postReceive(Message<?> message, MessageChannel channel) {
return message;
}
}
}

3
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests.java
View File

@@ -29,7 +29,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.AbstractMessageChannel;
import org.springframework.integration.channel.ChannelInterceptorAware;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.messaging.support.ChannelInterceptorAdapter;
/**
* @author Oleg Zhurakousky
@@ -54,7 +53,7 @@ public class GlobalChannelInterceptorTests {
}
public static class SampleInterceptor extends ChannelInterceptorAdapter {
public static class SampleInterceptor implements ChannelInterceptor {
}
}

3
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java
View File

@@ -45,7 +45,6 @@ import org.springframework.jms.listener.SimpleMessageListenerContainer;
import org.springframework.jms.support.destination.DestinationResolver;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.messaging.support.ChannelInterceptorAdapter;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -333,7 +332,7 @@ public class JmsChannelParserTests {
}
static class TestInterceptor extends ChannelInterceptorAdapter {
static class TestInterceptor implements ChannelInterceptor {
}
static class CustomTestMessageListenerContainer extends DefaultMessageListenerContainer {

12
spring-integration-jms/src/test/java/org/springframework/integration/jms/dsl/JmsTests.java
View File

@@ -73,7 +73,7 @@ import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
import org.springframework.messaging.support.ChannelInterceptorAdapter;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.stereotype.Component;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
@@ -344,12 +344,12 @@ public class JmsTests {
@Bean
public MessageChannel jmsMessageDrivenInputChannel() {
DirectChannel directChannel = new DirectChannel();
directChannel.addInterceptor(new ChannelInterceptorAdapter() {
directChannel.addInterceptor(new ChannelInterceptor() {
@Override
public Message<?> preSend(Message<?> message, MessageChannel channel) {
jmsMessageDrivenChannelCalled().set(true);
return super.preSend(message, channel);
return message;
}
});
@@ -397,12 +397,12 @@ public class JmsTests {
@Bean
public MessageChannel jmsInboundGatewayInputChannel() {
DirectChannel directChannel = new DirectChannel();
directChannel.addInterceptor(new ChannelInterceptorAdapter() {
directChannel.addInterceptor(new ChannelInterceptor() {
@Override
public Message<?> preSend(Message<?> message, MessageChannel channel) {
jmsInboundGatewayChannelCalled().set(true);
return super.preSend(message, channel);
return message;
}
});
@@ -444,7 +444,7 @@ public class JmsTests {
@Component
@GlobalChannelInterceptor(patterns = "flow1QueueChannel")
public static class TestChannelInterceptor extends ChannelInterceptorAdapter {
public static class TestChannelInterceptor implements ChannelInterceptor {
private final AtomicInteger invoked = new AtomicInteger();