diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java index e4d890f20e..35745ab809 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java @@ -30,7 +30,7 @@ import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.BridgeHandler; -import org.springframework.integration.message.InboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java index 569ea24371..d7fcba586b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java @@ -38,7 +38,7 @@ import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.handler.ArgumentArrayMessageMapper; -import org.springframework.integration.message.InboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java index 0025ff3150..d8cb538ff5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java @@ -18,8 +18,8 @@ package org.springframework.integration.gateway; import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.InboundMessageMapper; -import org.springframework.integration.message.OutboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; +import org.springframework.integration.mapping.OutboundMessageMapper; /** * An implementation of the {@link InboundMessageMapper} and diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java index 39d9d6e830..15f5ae3d8d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java @@ -18,8 +18,8 @@ package org.springframework.integration.gateway; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; -import org.springframework.integration.message.InboundMessageMapper; -import org.springframework.integration.message.OutboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; +import org.springframework.integration.mapping.OutboundMessageMapper; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java index 90f4c308ce..f677514657 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java @@ -40,7 +40,7 @@ import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.InboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/InboundJsonMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/json/InboundJsonMessageMapper.java index 6532b4cdb0..413c624886 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/InboundJsonMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/InboundJsonMessageMapper.java @@ -32,7 +32,7 @@ import org.codehaus.jackson.type.TypeReference; import org.springframework.integration.Message; import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.InboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/OutboundJsonMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/json/OutboundJsonMessageMapper.java index 7d47d07e80..a13d21aded 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/OutboundJsonMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/OutboundJsonMessageMapper.java @@ -4,7 +4,7 @@ import java.io.StringWriter; import org.codehaus.jackson.map.ObjectMapper; import org.springframework.integration.Message; -import org.springframework.integration.message.OutboundMessageMapper; +import org.springframework.integration.mapping.OutboundMessageMapper; /** * {@link OutboundMessageMapper} implementation the converts a {@link Message} to a JSON string representation. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/HeaderMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/HeaderMapper.java similarity index 96% rename from spring-integration-core/src/main/java/org/springframework/integration/message/HeaderMapper.java rename to spring-integration-core/src/main/java/org/springframework/integration/mapping/HeaderMapper.java index 622171b517..70b010d150 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/HeaderMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/HeaderMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.message; +package org.springframework.integration.mapping; import java.util.Map; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/InboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/InboundMessageMapper.java similarity index 94% rename from spring-integration-core/src/main/java/org/springframework/integration/message/InboundMessageMapper.java rename to spring-integration-core/src/main/java/org/springframework/integration/mapping/InboundMessageMapper.java index afd2769db7..3c5e6b3679 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/InboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/InboundMessageMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.message; +package org.springframework.integration.mapping; import org.springframework.integration.Message; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageMappingException.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/MessageMappingException.java similarity index 96% rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageMappingException.java rename to spring-integration-core/src/main/java/org/springframework/integration/mapping/MessageMappingException.java index 8ab3648458..e4de83b16b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageMappingException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/MessageMappingException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.message; +package org.springframework.integration.mapping; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/OutboundMessageMapper.java similarity index 94% rename from spring-integration-core/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java rename to spring-integration-core/src/main/java/org/springframework/integration/mapping/OutboundMessageMapper.java index 9bcf4f57bb..e6fe9ba33b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/OutboundMessageMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.message; +package org.springframework.integration.mapping; import org.springframework.integration.Message; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java index 9d8f811f6b..9e1c4763c1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java @@ -28,7 +28,7 @@ import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.StringMessage; import org.springframework.integration.core.SubscribableChannel; -import org.springframework.integration.message.InboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultHttpHeaderMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultHttpHeaderMapper.java index fa17ea27b8..e9aa1b264a 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultHttpHeaderMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultHttpHeaderMapper.java @@ -20,7 +20,7 @@ import java.util.Map; import org.springframework.http.HttpHeaders; import org.springframework.integration.MessageHeaders; -import org.springframework.integration.message.HeaderMapper; +import org.springframework.integration.mapping.HeaderMapper; /** * Default {@link HeaderMapper} implementation for HTTP. diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java index c83e23b415..a5e6cd1f0c 100755 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java @@ -32,7 +32,7 @@ import org.springframework.integration.MessagingException; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.integration.message.HeaderMapper; +import org.springframework.integration.mapping.HeaderMapper; import org.springframework.util.Assert; import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.RestTemplate; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java index bcd50f6f98..512e74753a 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java @@ -43,7 +43,7 @@ import org.springframework.integration.Message; import org.springframework.integration.MessagingException; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.gateway.AbstractMessagingGateway; -import org.springframework.integration.message.HeaderMapper; +import org.springframework.integration.mapping.HeaderMapper; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.LinkedMultiValueMap; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/InboundRequestMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/InboundRequestMapper.java index 670a877148..bdf3cc4f7f 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/InboundRequestMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/InboundRequestMapper.java @@ -18,7 +18,7 @@ package org.springframework.integration.http; import javax.servlet.http.HttpServletRequest; -import org.springframework.integration.message.InboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; /** * Strategy interface for mapping from an inbound {@link HttpServletRequest} diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/OutboundRequestMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/OutboundRequestMapper.java index 754817a9bd..9f63533176 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/OutboundRequestMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/OutboundRequestMapper.java @@ -17,7 +17,7 @@ package org.springframework.integration.http; import org.springframework.http.HttpEntity; -import org.springframework.integration.message.OutboundMessageMapper; +import org.springframework.integration.mapping.OutboundMessageMapper; /** * Strategy for mapping to an {@link HttpEntity} from a message. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java index 9a268a1259..9a20c248f5 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java @@ -24,7 +24,7 @@ import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.ip.AbstractInternetProtocolSendingMessageHandler; -import org.springframework.integration.message.MessageMappingException; +import org.springframework.integration.mapping.MessageMappingException; /** * Abstract class for TCP sending message handlers. Implementations diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java index 3edf214860..566120f2d0 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java @@ -26,7 +26,7 @@ import java.nio.ByteBuffer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.message.MessageMappingException; +import org.springframework.integration.mapping.MessageMappingException; /** * A SocketReader that reads from a {@link java.net.Socket}. Threads diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java index 73c2c77599..f67246dd38 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java @@ -24,7 +24,7 @@ import java.nio.channels.SocketChannel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.message.MessageMappingException; +import org.springframework.integration.mapping.MessageMappingException; /** * A non-blocking SocketReader that reads from a {@link java.nio.channels.SocketChannel}. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java index d9b9152361..f572c4ab02 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java @@ -22,7 +22,7 @@ import java.util.concurrent.Executor; import org.springframework.integration.Message; import org.springframework.integration.gateway.AbstractMessagingGateway; -import org.springframework.integration.message.MessageMappingException; +import org.springframework.integration.mapping.MessageMappingException; /** * Simple implementation of a TCP/IP inbound gateway; uses {@link java.net.Socket} diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketIoUtils.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketIoUtils.java index 412ee5d549..07a810e6ad 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketIoUtils.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketIoUtils.java @@ -21,7 +21,7 @@ import java.net.Socket; import java.nio.channels.SocketChannel; import org.springframework.beans.BeanUtils; -import org.springframework.integration.message.MessageMappingException; +import org.springframework.integration.mapping.MessageMappingException; /** * @author Gary Russell diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java index 2cabb3839b..37ba06ff35 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java @@ -22,8 +22,8 @@ import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.IpHeaders; -import org.springframework.integration.message.InboundMessageMapper; -import org.springframework.integration.message.OutboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; +import org.springframework.integration.mapping.OutboundMessageMapper; /** * Maps incoming data from a {@link SocketReader} to a {@link Message} and from diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java index 2a462abc73..e3df7aeb75 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java @@ -32,7 +32,7 @@ import org.springframework.integration.ip.tcp.connection.AbstractConnectionFacto import org.springframework.integration.ip.tcp.connection.ConnectionFactory; import org.springframework.integration.ip.tcp.connection.TcpConnection; import org.springframework.integration.ip.tcp.connection.TcpSender; -import org.springframework.integration.message.MessageMappingException; +import org.springframework.integration.mapping.MessageMappingException; /** * Tcp outbound channel adapter using a TcpConnection to diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java index e1b034d77a..45b229d650 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java @@ -21,8 +21,8 @@ import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.IpHeaders; -import org.springframework.integration.message.InboundMessageMapper; -import org.springframework.integration.message.OutboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; +import org.springframework.integration.mapping.OutboundMessageMapper; /** * Maps incoming data from a {@link TcpConnection} to a {@link Message}. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/converter/ByteArrayStxEtxConverter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/converter/ByteArrayStxEtxConverter.java index 2ffe4aff63..54886a8d2e 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/converter/ByteArrayStxEtxConverter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/converter/ByteArrayStxEtxConverter.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.springframework.integration.message.MessageMappingException; +import org.springframework.integration.mapping.MessageMappingException; /** * Converts data in an InputStream to a byte[]; data is prefixed by <stx> and diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java index 92d787f3ac..67608f68fd 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java @@ -29,9 +29,9 @@ import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.util.RegexUtils; -import org.springframework.integration.message.InboundMessageMapper; -import org.springframework.integration.message.MessageMappingException; -import org.springframework.integration.message.OutboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; +import org.springframework.integration.mapping.MessageMappingException; +import org.springframework.integration.mapping.OutboundMessageMapper; import org.springframework.util.Assert; /** diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java index a6021da673..90a63a1378 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java @@ -30,7 +30,7 @@ import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.udp.DatagramPacketMessageMapper; -import org.springframework.integration.message.MessageMappingException; +import org.springframework.integration.mapping.MessageMappingException; /** * @author Gary Russell diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannel.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannel.java index 6b79352da2..f2ad0309f1 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannel.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannel.java @@ -33,7 +33,7 @@ import org.springframework.integration.dispatcher.MessageDispatcher; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; import org.springframework.integration.dispatcher.UnicastingDispatcher; import org.springframework.integration.gateway.SimpleMessageMapper; -import org.springframework.integration.message.InboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.listener.AbstractMessageListenerContainer; import org.springframework.jms.support.converter.MessageConverter; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java index b73d6fecb8..0fdb38d604 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java @@ -18,7 +18,7 @@ package org.springframework.integration.jms; import javax.jms.Message; -import org.springframework.integration.message.HeaderMapper; +import org.springframework.integration.mapping.HeaderMapper; /** * Strategy interface for mapping integration Message headers to an outbound diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java index 6537c4403a..5b3a6b28b9 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.InboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.MessageCreator; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java index 23194f1b2f..1470fb4799 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java @@ -24,7 +24,7 @@ import org.springframework.integration.Message; import org.springframework.integration.MessagingException; import org.springframework.integration.core.MessageSource; import org.springframework.integration.gateway.SimpleMessageMapper; -import org.springframework.integration.message.InboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.jmx.support.ObjectNameManager; import org.springframework.util.Assert; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/DefaultNotificationMapper.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/DefaultNotificationMapper.java index ced1d292a7..f110ab7b1e 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/DefaultNotificationMapper.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/DefaultNotificationMapper.java @@ -22,7 +22,7 @@ import javax.management.Notification; import javax.management.ObjectName; import org.springframework.integration.Message; -import org.springframework.integration.message.OutboundMessageMapper; +import org.springframework.integration.mapping.OutboundMessageMapper; import org.springframework.util.Assert; /** diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java index f8ad90fc4b..72aa1f0f2a 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.integration.Message; import org.springframework.integration.handler.AbstractMessageHandler; -import org.springframework.integration.message.OutboundMessageMapper; +import org.springframework.integration.mapping.OutboundMessageMapper; import org.springframework.jmx.export.MBeanExporter; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.jmx.export.notification.NotificationPublisher; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java index d103165340..3f5a5cc29e 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java @@ -24,7 +24,7 @@ import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.message.MessageMappingException; +import org.springframework.integration.mapping.MessageMappingException; import org.springframework.mail.MailMessage; import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java index 46f894df31..257974e0d4 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java @@ -33,7 +33,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.MessageMappingException; +import org.springframework.integration.mapping.MessageMappingException; import org.springframework.mail.SimpleMailMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppPresenceMessageMapper.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppPresenceMessageMapper.java index 7816498bca..159bbd2e55 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppPresenceMessageMapper.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppPresenceMessageMapper.java @@ -23,15 +23,15 @@ import org.jivesoftware.smack.packet.Presence; import org.springframework.integration.Message; import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.InboundMessageMapper; -import org.springframework.integration.message.OutboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; +import org.springframework.integration.mapping.OutboundMessageMapper; import org.springframework.integration.xmpp.XmppHeaders; import org.springframework.util.StringUtils; /** - * Implementation of the strategy interface {@link org.springframework.integration.message.OutboundMessageMapper}. This is the hook that lets the adapter receive various payloads from + * Implementation of the strategy interface {@link org.springframework.integration.mapping.OutboundMessageMapper}. This is the hook that lets the adapter receive various payloads from * components inside Spring Integration and forward them correctly as {@link org.jivesoftware.smack.packet.Presence} instances. * * @author Josh Long diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java index 9dc8c098ad..de1af7309d 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java @@ -31,7 +31,7 @@ import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.endpoint.AbstractEndpoint; -import org.springframework.integration.message.InboundMessageMapper; +import org.springframework.integration.mapping.InboundMessageMapper; import java.util.Collection; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java index 2df8783d96..3f33f34bfd 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java @@ -10,7 +10,7 @@ import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.message.OutboundMessageMapper; +import org.springframework.integration.mapping.OutboundMessageMapper; /** * This class will facilitate publishing updated presence values for a given connection. This change happens on the diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java index 418a7d9a76..629d44cf08 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java @@ -32,7 +32,7 @@ import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.message.*; +import org.springframework.integration.mapping.*; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java index e372274487..bf89ec6876 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java @@ -23,7 +23,7 @@ import org.jivesoftware.smack.packet.Presence; import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageSource; -import org.springframework.integration.message.*; +import org.springframework.integration.mapping.*; import org.springframework.integration.xmpp.XmppHeaders; /**