Skip to content

Commit ccfa2de

Browse files
PascalSchumacherdavsclaus
PascalSchumacher
authored and
davsclaus
committed
CAMEL-9338: Upgrade Spring Integration to version 4.2.2
1 parent 3b7abcc commit ccfa2de

File tree

14 files changed

+63
-62
lines changed

14 files changed

+63
-62
lines changed

‎components/camel-spring-integration/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -31,7 +31,8 @@
31

31

32
<properties>
32
<properties>
33
<camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
33
<camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
34-
<camel.osgi.import.before.defaults>org.springframework.integration.*;version="[2,3)"</camel.osgi.import.before.defaults>
34+
<camel.osgi.import.before.defaults>org.springframework.integration.*;version="[4"
35+
org.springframework.messaging.*;version="[4"</camel.osgi.import.before.defaults>
35
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-integration</camel.osgi.export.service>
36
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-integration</camel.osgi.export.service>
36

37

37
<!-- must use older spring version -->
38
<!-- must use older spring version -->

‎components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java

Lines changed: 5 additions & 5 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -19,7 +19,7 @@
19
import java.util.Map;
19
import java.util.Map;
20

20

21
import org.apache.camel.Exchange;
21
import org.apache.camel.Exchange;
22-
import org.springframework.integration.message.GenericMessage;
22+
import org.springframework.messaging.support.GenericMessage;
23

23

24
/**
24
/**
25
* The helper class for Mapping between the Spring Integration message and the Camel Message.
25
* The helper class for Mapping between the Spring Integration message and the Camel Message.
@@ -32,20 +32,20 @@ private SpringIntegrationBinding() {
32
// Helper class
32
// Helper class
33
}
33
}
34

34

35-
public static org.springframework.integration.Message<?> createSpringIntegrationMessage(Exchange exchange) {
35+
public static org.springframework.messaging.Message<?> createSpringIntegrationMessage(Exchange exchange) {
36
return createSpringIntegrationMessage(exchange, exchange.getIn().getHeaders());
36
return createSpringIntegrationMessage(exchange, exchange.getIn().getHeaders());
37
}
37
}
38

38

39-
public static org.springframework.integration.Message<?> createSpringIntegrationMessage(Exchange exchange, Map<String, Object> headers) {
39+
public static org.springframework.messaging.Message<?> createSpringIntegrationMessage(Exchange exchange, Map<String, Object> headers) {
40
org.apache.camel.Message message = exchange.getIn();
40
org.apache.camel.Message message = exchange.getIn();
41
return new GenericMessage<Object>(message.getBody(), headers);
41
return new GenericMessage<Object>(message.getBody(), headers);
42
}
42
}
43

43

44-
public static org.springframework.integration.Message<?> storeToSpringIntegrationMessage(org.apache.camel.Message message) {
44+
public static org.springframework.messaging.Message<?> storeToSpringIntegrationMessage(org.apache.camel.Message message) {
45
return new GenericMessage<Object>(message.getBody(), message.getHeaders());
45
return new GenericMessage<Object>(message.getBody(), message.getHeaders());
46
}
46
}
47

47

48-
public static void storeToCamelMessage(org.springframework.integration.Message<?> siMessage, org.apache.camel.Message cMessage) {
48+
public static void storeToCamelMessage(org.springframework.messaging.Message<?> siMessage, org.apache.camel.Message cMessage) {
49
cMessage.setBody(siMessage.getPayload());
49
cMessage.setBody(siMessage.getPayload());
50
cMessage.setHeaders(siMessage.getHeaders());
50
cMessage.setHeaders(siMessage.getHeaders());
51
}
51
}

‎components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java

Lines changed: 10 additions & 10 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -22,11 +22,11 @@
22
import org.apache.camel.impl.DefaultConsumer;
22
import org.apache.camel.impl.DefaultConsumer;
23
import org.apache.camel.spring.SpringCamelContext;
23
import org.apache.camel.spring.SpringCamelContext;
24
import org.apache.camel.util.ObjectHelper;
24
import org.apache.camel.util.ObjectHelper;
25-
import org.springframework.integration.MessageChannel;
25+
import org.springframework.messaging.MessageChannel;
26-
import org.springframework.integration.core.MessageHandler;
26+
import org.springframework.messaging.MessageHandler;
27-
import org.springframework.integration.core.SubscribableChannel;
27+
import org.springframework.messaging.SubscribableChannel;
28
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
28
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
29-
import org.springframework.integration.support.channel.ChannelResolver;
29+
import org.springframework.messaging.core.DestinationResolver;
30

30

31
/**
31
/**
32
* A consumer of exchanges for the Spring Integration
32
* A consumer of exchanges for the Spring Integration
@@ -38,14 +38,14 @@
38
*/
38
*/
39
public class SpringIntegrationConsumer extends DefaultConsumer implements MessageHandler {
39
public class SpringIntegrationConsumer extends DefaultConsumer implements MessageHandler {
40
private final SpringCamelContext context;
40
private final SpringCamelContext context;
41-
private final ChannelResolver channelResolver;
41+
private final DestinationResolver<MessageChannel> destinationResolver;
42
private SubscribableChannel inputChannel;
42
private SubscribableChannel inputChannel;
43
private MessageChannel outputChannel;
43
private MessageChannel outputChannel;
44

44

45
public SpringIntegrationConsumer(SpringIntegrationEndpoint endpoint, Processor processor) {
45
public SpringIntegrationConsumer(SpringIntegrationEndpoint endpoint, Processor processor) {
46
super(endpoint, processor);
46
super(endpoint, processor);
47
this.context = (SpringCamelContext) endpoint.getCamelContext();
47
this.context = (SpringCamelContext) endpoint.getCamelContext();
48-
this.channelResolver = new BeanFactoryChannelResolver(context.getApplicationContext());
48+
this.destinationResolver = new BeanFactoryChannelResolver(context.getApplicationContext());
49
}
49
}
50

50

51
@Override
51
@Override
@@ -68,7 +68,7 @@ protected void doStart() throws Exception {
68
}
68
}
69

69

70
ObjectHelper.notEmpty(inputChannelName, "inputChannelName", getEndpoint());
70
ObjectHelper.notEmpty(inputChannelName, "inputChannelName", getEndpoint());
71-
inputChannel = (SubscribableChannel) channelResolver.resolveChannelName(inputChannelName);
71+
inputChannel = (SubscribableChannel) destinationResolver.resolveDestination(inputChannelName);
72
} else {
72
} else {
73
inputChannel = (SubscribableChannel) getEndpoint().getMessageChannel();
73
inputChannel = (SubscribableChannel) getEndpoint().getMessageChannel();
74
}
74
}
@@ -81,7 +81,7 @@ protected void doStart() throws Exception {
81
if (getEndpoint().isInOut()) {
81
if (getEndpoint().isInOut()) {
82
// we need to setup right outputChannel for further processing
82
// we need to setup right outputChannel for further processing
83
ObjectHelper.notEmpty(getEndpoint().getOutputChannel(), "OutputChannel", getEndpoint());
83
ObjectHelper.notEmpty(getEndpoint().getOutputChannel(), "OutputChannel", getEndpoint());
84-
outputChannel = channelResolver.resolveChannelName(getEndpoint().getOutputChannel());
84+
outputChannel = destinationResolver.resolveDestination(getEndpoint().getOutputChannel());
85

85

86
if (outputChannel == null) {
86
if (outputChannel == null) {
87
throw new IllegalArgumentException("Cannot resolve OutputChannel on " + getEndpoint());
87
throw new IllegalArgumentException("Cannot resolve OutputChannel on " + getEndpoint());
@@ -91,7 +91,7 @@ protected void doStart() throws Exception {
91
inputChannel.subscribe(this);
91
inputChannel.subscribe(this);
92
}
92
}
93

93

94-
public void handleMessage(org.springframework.integration.Message<?> siInMessage) {
94+
public void handleMessage(org.springframework.messaging.Message<?> siInMessage) {
95
// we received a message from spring integration
95
// we received a message from spring integration
96
// wrap that in a Camel Exchange and process it
96
// wrap that in a Camel Exchange and process it
97
Exchange exchange = getEndpoint().createExchange(getEndpoint().isInOut() ? ExchangePattern.InOut : ExchangePattern.InOnly);
97
Exchange exchange = getEndpoint().createExchange(getEndpoint().isInOut() ? ExchangePattern.InOut : ExchangePattern.InOnly);
@@ -131,7 +131,7 @@ public void handleMessage(org.springframework.integration.Message<?> siInMessage
131
}
131
}
132

132

133
// put the message back the outputChannel if we need
133
// put the message back the outputChannel if we need
134-
org.springframework.integration.Message<?> siOutMessage =
134+
org.springframework.messaging.Message<?> siOutMessage =
135
SpringIntegrationBinding.storeToSpringIntegrationMessage(exchange.getOut());
135
SpringIntegrationBinding.storeToSpringIntegrationMessage(exchange.getOut());
136

136

137
// send the message to spring integration
137
// send the message to spring integration

‎components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -26,7 +26,7 @@
26
import org.apache.camel.spi.UriParam;
26
import org.apache.camel.spi.UriParam;
27
import org.apache.camel.spi.UriPath;
27
import org.apache.camel.spi.UriPath;
28
import org.apache.camel.spring.SpringCamelContext;
28
import org.apache.camel.spring.SpringCamelContext;
29-
import org.springframework.integration.MessageChannel;
29+
import org.springframework.messaging.MessageChannel;
30

30

31
/**
31
/**
32
* Defines the <a href="http://camel.apache.org/springIntergration.html">Spring Integration Endpoint</a>
32
* Defines the <a href="http://camel.apache.org/springIntergration.html">Spring Integration Endpoint</a>

‎components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java

Lines changed: 4 additions & 4 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -27,20 +27,20 @@
27
* @version
27
* @version
28
*/
28
*/
29
public class SpringIntegrationMessage extends DefaultMessage {
29
public class SpringIntegrationMessage extends DefaultMessage {
30-
private org.springframework.integration.Message<?> siMessage;
30+
private org.springframework.messaging.Message<?> siMessage;
31

31

32
public SpringIntegrationMessage() {
32
public SpringIntegrationMessage() {
33
}
33
}
34

34

35-
public SpringIntegrationMessage(org.springframework.integration.Message<?> message) {
35+
public SpringIntegrationMessage(org.springframework.messaging.Message<?> message) {
36
this.siMessage = message;
36
this.siMessage = message;
37
}
37
}
38

38

39-
public void setMessage(org.springframework.integration.Message<?> message) {
39+
public void setMessage(org.springframework.messaging.Message<?> message) {
40
this.siMessage = message;
40
this.siMessage = message;
41
}
41
}
42

42

43-
public org.springframework.integration.Message<?> getMessage() {
43+
public org.springframework.messaging.Message<?> getMessage() {
44
return siMessage;
44
return siMessage;
45
}
45
}
46

46

‎components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java

Lines changed: 10 additions & 10 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -21,13 +21,13 @@
21
import org.apache.camel.impl.DefaultProducer;
21
import org.apache.camel.impl.DefaultProducer;
22
import org.apache.camel.spring.SpringCamelContext;
22
import org.apache.camel.spring.SpringCamelContext;
23
import org.apache.camel.util.ObjectHelper;
23
import org.apache.camel.util.ObjectHelper;
24-
import org.springframework.integration.Message;
24+
import org.springframework.messaging.Message;
25-
import org.springframework.integration.MessageChannel;
25+
import org.springframework.messaging.MessageChannel;
26-
import org.springframework.integration.MessageHeaders;
26+
import org.springframework.messaging.MessageHeaders;
27
import org.springframework.integration.channel.DirectChannel;
27
import org.springframework.integration.channel.DirectChannel;
28-
import org.springframework.integration.core.MessageHandler;
28+
import org.springframework.messaging.MessageHandler;
29
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
29
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
30-
import org.springframework.integration.support.channel.ChannelResolver;
30+
import org.springframework.messaging.core.DestinationResolver;
31

31

32
/**
32
/**
33
* A producer of exchanges for the Spring Integration
33
* A producer of exchanges for the Spring Integration
@@ -37,13 +37,13 @@
37
* @version
37
* @version
38
*/
38
*/
39
public class SpringIntegrationProducer extends DefaultProducer implements Processor {
39
public class SpringIntegrationProducer extends DefaultProducer implements Processor {
40-
private final ChannelResolver channelResolver;
40+
private final DestinationResolver<MessageChannel> destinationResolver;
41
private DirectChannel inputChannel;
41
private DirectChannel inputChannel;
42
private MessageChannel outputChannel;
42
private MessageChannel outputChannel;
43

43

44
public SpringIntegrationProducer(SpringCamelContext context, SpringIntegrationEndpoint endpoint) {
44
public SpringIntegrationProducer(SpringCamelContext context, SpringIntegrationEndpoint endpoint) {
45
super(endpoint);
45
super(endpoint);
46-
this.channelResolver = new BeanFactoryChannelResolver(context.getApplicationContext());
46+
this.destinationResolver = new BeanFactoryChannelResolver(context.getApplicationContext());
47
}
47
}
48

48

49
@Override
49
@Override
@@ -62,7 +62,7 @@ protected void doStart() throws Exception {
62
}
62
}
63

63

64
ObjectHelper.notEmpty(outputChannelName, "OutputChannelName", getEndpoint());
64
ObjectHelper.notEmpty(outputChannelName, "OutputChannelName", getEndpoint());
65-
outputChannel = channelResolver.resolveChannelName(outputChannelName);
65+
outputChannel = destinationResolver.resolveDestination(outputChannelName);
66
} else {
66
} else {
67
outputChannel = getEndpoint().getMessageChannel();
67
outputChannel = getEndpoint().getMessageChannel();
68
}
68
}
@@ -75,7 +75,7 @@ protected void doStart() throws Exception {
75
if (getEndpoint().isInOut()) {
75
if (getEndpoint().isInOut()) {
76
// we need to setup right inputChannel for further processing
76
// we need to setup right inputChannel for further processing
77
ObjectHelper.notEmpty(getEndpoint().getInputChannel(), "InputChannel", getEndpoint());
77
ObjectHelper.notEmpty(getEndpoint().getInputChannel(), "InputChannel", getEndpoint());
78-
inputChannel = (DirectChannel)channelResolver.resolveChannelName(getEndpoint().getInputChannel());
78+
inputChannel = (DirectChannel)destinationResolver.resolveDestination(getEndpoint().getInputChannel());
79

79

80
if (inputChannel == null) {
80
if (inputChannel == null) {
81
throw new IllegalArgumentException("Cannot resolve InputChannel on " + getEndpoint());
81
throw new IllegalArgumentException("Cannot resolve InputChannel on " + getEndpoint());
@@ -100,7 +100,7 @@ public void handleMessage(Message<?> message) {
100
}
100
}
101
});
101
});
102
}
102
}
103-
org.springframework.integration.Message<?> siOutmessage = SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
103+
org.springframework.messaging.Message<?> siOutmessage = SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
104

104

105
// send the message to spring integration
105
// send the message to spring integration
106
log.debug("Sending {} to OutputChannel: {}", siOutmessage, outputChannel);
106
log.debug("Sending {} to OutputChannel: {}", siOutmessage, outputChannel);

‎components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java

Lines changed: 5 additions & 5 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -27,11 +27,11 @@
27
import org.slf4j.LoggerFactory;
27
import org.slf4j.LoggerFactory;
28
import org.springframework.beans.factory.DisposableBean;
28
import org.springframework.beans.factory.DisposableBean;
29
import org.springframework.beans.factory.InitializingBean;
29
import org.springframework.beans.factory.InitializingBean;
30-
import org.springframework.integration.Message;
30+
import org.springframework.messaging.Message;
31-
import org.springframework.integration.MessageChannel;
31+
import org.springframework.messaging.MessageChannel;
32-
import org.springframework.integration.MessageHeaders;
32+
import org.springframework.messaging.MessageHeaders;
33
import org.springframework.integration.channel.DirectChannel;
33
import org.springframework.integration.channel.DirectChannel;
34-
import org.springframework.integration.core.MessageHandler;
34+
import org.springframework.messaging.MessageHandler;
35

35

36
/**
36
/**
37
* A CamelContext will be injected into CameSourceAdapter which will
37
* A CamelContext will be injected into CameSourceAdapter which will
@@ -62,7 +62,7 @@ public void setReplyChannel(DirectChannel channel) {
62

62

63
protected class ConsumerProcessor implements Processor {
63
protected class ConsumerProcessor implements Processor {
64
public void process(final Exchange exchange) throws Exception {
64
public void process(final Exchange exchange) throws Exception {
65-
org.springframework.integration.Message<?> request = SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
65+
org.springframework.messaging.Message<?> request = SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
66

66

67
if (exchange.getPattern().isOutCapable()) {
67
if (exchange.getPattern().isOutCapable()) {
68
exchange.getIn().getHeaders().put(MessageHeaders.REPLY_CHANNEL , replyChannel);
68
exchange.getIn().getHeaders().put(MessageHeaders.REPLY_CHANNEL , replyChannel);

‎components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java

Lines changed: 5 additions & 5 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -23,11 +23,11 @@
23
import org.apache.camel.component.spring.integration.SpringIntegrationBinding;
23
import org.apache.camel.component.spring.integration.SpringIntegrationBinding;
24
import org.apache.camel.impl.DefaultCamelContext;
24
import org.apache.camel.impl.DefaultCamelContext;
25
import org.apache.camel.impl.DefaultExchange;
25
import org.apache.camel.impl.DefaultExchange;
26-
import org.springframework.integration.Message;
26+
import org.springframework.messaging.Message;
27-
import org.springframework.integration.MessageChannel;
27+
import org.springframework.messaging.MessageChannel;
28-
import org.springframework.integration.MessageDeliveryException;
28+
import org.springframework.messaging.MessageDeliveryException;
29-
import org.springframework.integration.MessageHeaders;
29+
import org.springframework.messaging.MessageHeaders;
30-
import org.springframework.integration.core.MessageHandler;
30+
import org.springframework.messaging.MessageHandler;
31

31

32
/**
32
/**
33
* CamelTargetAdapter will redirect the Spring Integration message to the Camel context.
33
* CamelTargetAdapter will redirect the Spring Integration message to the Camel context.

‎components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java

Lines changed: 6 additions & 6 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -20,9 +20,9 @@
20
import org.apache.camel.Endpoint;
20
import org.apache.camel.Endpoint;
21
import org.apache.camel.component.spring.integration.SpringIntegrationEndpoint;
21
import org.apache.camel.component.spring.integration.SpringIntegrationEndpoint;
22
import org.apache.camel.component.spring.integration.SpringIntegrationMessage;
22
import org.apache.camel.component.spring.integration.SpringIntegrationMessage;
23-
import org.springframework.integration.MessageChannel;
23+
import org.springframework.messaging.MessageChannel;
24-
import org.springframework.integration.MessageHeaders;
24+
import org.springframework.messaging.MessageHeaders;
25-
import org.springframework.integration.message.GenericMessage;
25+
import org.springframework.messaging.support.GenericMessage;
26

26

27
/**
27
/**
28
* The <a href="http://camel.apache.org/type-converter.html">Type Converters</a>
28
* The <a href="http://camel.apache.org/type-converter.html">Type Converters</a>
@@ -45,10 +45,10 @@ public static Endpoint toEndpoint(final MessageChannel channel) throws Exception
45
}
45
}
46

46

47
@Converter
47
@Converter
48-
public static org.springframework.integration.Message<?> toSpringMessage(final org.apache.camel.Message camelMessage) throws Exception {
48+
public static org.springframework.messaging.Message<?> toSpringMessage(final org.apache.camel.Message camelMessage) throws Exception {
49
if (camelMessage instanceof SpringIntegrationMessage) {
49
if (camelMessage instanceof SpringIntegrationMessage) {
50
SpringIntegrationMessage siMessage = (SpringIntegrationMessage)camelMessage;
50
SpringIntegrationMessage siMessage = (SpringIntegrationMessage)camelMessage;
51-
org.springframework.integration.Message<?> message = siMessage.getMessage();
51+
org.springframework.messaging.Message<?> message = siMessage.getMessage();
52
if (message != null) {
52
if (message != null) {
53
return message;
53
return message;
54
}
54
}
@@ -60,7 +60,7 @@ public static org.springframework.integration.Message<?> toSpringMessage(final o
60
}
60
}
61

61

62
@Converter
62
@Converter
63-
public static org.apache.camel.Message toCamelMessage(final org.springframework.integration.Message<?> springMessage) throws Exception {
63+
public static org.apache.camel.Message toCamelMessage(final org.springframework.messaging.Message<?> springMessage) throws Exception {
64
return new SpringIntegrationMessage(springMessage);
64
return new SpringIntegrationMessage(springMessage);
65
}
65
}
66

66

‎components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -20,8 +20,8 @@
20
import org.apache.camel.test.spring.CamelSpringTestSupport;
20
import org.apache.camel.test.spring.CamelSpringTestSupport;
21
import org.junit.Test;
21
import org.junit.Test;
22
import org.springframework.context.support.ClassPathXmlApplicationContext;
22
import org.springframework.context.support.ClassPathXmlApplicationContext;
23-
import org.springframework.integration.MessageChannel;
23+
import org.springframework.messaging.MessageChannel;
24-
import org.springframework.integration.message.GenericMessage;
24+
import org.springframework.messaging.support.GenericMessage;
25

25

26
public class SpringIntegrationOneWayConsumerTest extends CamelSpringTestSupport {
26
public class SpringIntegrationOneWayConsumerTest extends CamelSpringTestSupport {
27

27

‎components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -24,12 +24,12 @@
24
import org.apache.camel.test.spring.CamelSpringTestSupport;
24
import org.apache.camel.test.spring.CamelSpringTestSupport;
25
import org.junit.Test;
25
import org.junit.Test;
26
import org.springframework.context.support.ClassPathXmlApplicationContext;
26
import org.springframework.context.support.ClassPathXmlApplicationContext;
27-
import org.springframework.integration.Message;
27+
import org.springframework.messaging.Message;
28-
import org.springframework.integration.MessageChannel;
28+
import org.springframework.messaging.MessageChannel;
29-
import org.springframework.integration.MessageHeaders;
29+
import org.springframework.messaging.MessageHeaders;
30
import org.springframework.integration.channel.DirectChannel;
30
import org.springframework.integration.channel.DirectChannel;
31-
import org.springframework.integration.core.MessageHandler;
31+
import org.springframework.messaging.MessageHandler;
32-
import org.springframework.integration.message.GenericMessage;
32+
import org.springframework.messaging.support.GenericMessage;
33

33

34
public class SpringIntegrationTwoWayConsumerTest extends CamelSpringTestSupport {
34
public class SpringIntegrationTwoWayConsumerTest extends CamelSpringTestSupport {
35

35

‎components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -22,9 +22,9 @@
22
import org.apache.camel.test.spring.CamelSpringTestSupport;
22
import org.apache.camel.test.spring.CamelSpringTestSupport;
23
import org.junit.Test;
23
import org.junit.Test;
24
import org.springframework.context.support.ClassPathXmlApplicationContext;
24
import org.springframework.context.support.ClassPathXmlApplicationContext;
25-
import org.springframework.integration.Message;
25+
import org.springframework.messaging.Message;
26
import org.springframework.integration.channel.DirectChannel;
26
import org.springframework.integration.channel.DirectChannel;
27-
import org.springframework.integration.core.MessageHandler;
27+
import org.springframework.messaging.MessageHandler;
28

28

29
public class CamelSourceAdapterTest extends CamelSpringTestSupport {
29
public class CamelSourceAdapterTest extends CamelSpringTestSupport {
30

30

‎components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -25,12 +25,12 @@
25
import org.apache.camel.test.spring.CamelSpringTestSupport;
25
import org.apache.camel.test.spring.CamelSpringTestSupport;
26
import org.junit.Test;
26
import org.junit.Test;
27
import org.springframework.context.support.ClassPathXmlApplicationContext;
27
import org.springframework.context.support.ClassPathXmlApplicationContext;
28-
import org.springframework.integration.Message;
28+
import org.springframework.messaging.Message;
29-
import org.springframework.integration.MessageChannel;
29+
import org.springframework.messaging.MessageChannel;
30-
import org.springframework.integration.MessageHeaders;
30+
import org.springframework.messaging.MessageHeaders;
31
import org.springframework.integration.channel.DirectChannel;
31
import org.springframework.integration.channel.DirectChannel;
32-
import org.springframework.integration.core.MessageHandler;
32+
import org.springframework.messaging.MessageHandler;
33-
import org.springframework.integration.message.GenericMessage;
33+
import org.springframework.messaging.support.GenericMessage;
34

34

35
public class CamelTargetAdapterTest extends CamelSpringTestSupport {
35
public class CamelTargetAdapterTest extends CamelSpringTestSupport {
36

36

‎parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -467,7 +467,7 @@
467
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
467
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
468
<spring-data-commons-version>1.6.5.RELEASE</spring-data-commons-version>
468
<spring-data-commons-version>1.6.5.RELEASE</spring-data-commons-version>
469
<spring-data-redis-version>1.6.0.RELEASE</spring-data-redis-version>
469
<spring-data-redis-version>1.6.0.RELEASE</spring-data-redis-version>
470-
<spring-integration-version>2.2.6.RELEASE</spring-integration-version>
470+
<spring-integration-version>4.2.2.RELEASE</spring-integration-version>
471
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
471
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
472
<spring-ldap-version>2.0.4.RELEASE</spring-ldap-version>
472
<spring-ldap-version>2.0.4.RELEASE</spring-ldap-version>
473
<spring-ldap-bundle-version>2.0.3.RELEASE_1</spring-ldap-bundle-version>
473
<spring-ldap-bundle-version>2.0.3.RELEASE_1</spring-ldap-bundle-version>

0 commit comments

Comments
 (0)