diff --git a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java index c10b9110c1..0fc001da89 100644 --- a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java +++ b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java @@ -18,11 +18,11 @@ package org.springframework.integration.ip.tcp; import java.net.Socket; import java.net.SocketException; -import org.springframework.integration.adapter.MessageMappingException; import org.springframework.integration.core.Message; import org.springframework.integration.ip.AbstractInternetProtocolSendingMessageHandler; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.message.MessageMappingException; import org.springframework.integration.message.MessageRejectedException; /** diff --git a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java index 7ee7b45d08..b4a7536cdd 100644 --- a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java +++ b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java @@ -23,7 +23,8 @@ import java.nio.ByteBuffer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.adapter.MessageMappingException; + +import org.springframework.integration.message.MessageMappingException; /** * A SocketReader that reads from a {@link java.net.Socket}. Threads diff --git a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java index f37c819e0d..c72443b950 100644 --- a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java +++ b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java @@ -23,7 +23,8 @@ import java.nio.channels.SocketChannel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.adapter.MessageMappingException; + +import org.springframework.integration.message.MessageMappingException; /** * A non-blocking SocketReader that reads from a {@link java.nio.channels.SocketChannel}. diff --git a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java index 65edbadcf5..b23ae0777c 100644 --- a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java +++ b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java @@ -20,9 +20,9 @@ import java.net.Socket; import java.net.SocketException; import org.springframework.beans.BeanUtils; -import org.springframework.integration.adapter.MessageMappingException; import org.springframework.integration.core.Message; import org.springframework.integration.gateway.AbstractMessagingGateway; +import org.springframework.integration.message.MessageMappingException; /** * Simple implementation of a TCP/IP inbound gateway; uses {@link java.net.Socket} diff --git a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java index df0f9fafb4..d66dc76241 100644 --- a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java +++ b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java @@ -23,8 +23,8 @@ import java.net.Socket; import javax.net.ServerSocketFactory; import org.springframework.beans.BeanUtils; -import org.springframework.integration.adapter.MessageMappingException; import org.springframework.integration.core.Message; +import org.springframework.integration.message.MessageMappingException; /** * Tcp Receiving Channel adapter that uses a {@link java.net.Socket}. Each diff --git a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java index 266d768295..6aaca4e039 100644 --- a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java +++ b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java @@ -23,7 +23,6 @@ import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.springframework.integration.adapter.MessageMappingException; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.ip.IpHeaders; @@ -31,6 +30,7 @@ import org.springframework.integration.ip.util.RegexUtils; import org.springframework.integration.message.InboundMessageMapper; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.message.MessageMappingException; import org.springframework.integration.message.OutboundMessageMapper; import org.springframework.util.Assert; diff --git a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java index 9d23901df1..d6f789d264 100644 --- a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java +++ b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java @@ -26,11 +26,11 @@ import java.nio.ByteBuffer; import org.junit.Test; -import org.springframework.integration.adapter.MessageMappingException; import org.springframework.integration.core.Message; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.udp.DatagramPacketMessageMapper; import org.springframework.integration.message.MessageBuilder; +import org.springframework.integration.message.MessageMappingException; /** * @author Gary Russell diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java index 60cf3b7389..0e82d54c0b 100644 --- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java @@ -29,8 +29,8 @@ import javax.jms.JMSException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.adapter.MessageMappingException; import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.message.MessageMappingException; import org.springframework.util.StringUtils; /** diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java index 47647a4a9b..5002b7a639 100644 --- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java +++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,11 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import org.springframework.core.io.ByteArrayResource; -import org.springframework.integration.adapter.MessageMappingException; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.MessageHandler; import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.message.MessageMappingException; import org.springframework.mail.MailMessage; import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java index 687202d524..f590c83ba1 100644 --- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java +++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,9 +31,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.adapter.MessageMappingException; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageBuilder; +import org.springframework.integration.message.MessageMappingException; import org.springframework.mail.SimpleMailMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingException.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingException.java new file mode 100644 index 0000000000..5ff3d372c4 --- /dev/null +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingException.java @@ -0,0 +1,46 @@ +/* + * Copyright 2002-2010 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.message; + +import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; + +/** + * Exception that indicates an error during message mapping. + * + * @author Mark Fisher + */ +@SuppressWarnings("serial") +public class MessageMappingException extends MessagingException { + + public MessageMappingException(String description) { + super(description); + } + + public MessageMappingException(String description, Throwable cause) { + super(description, cause); + } + + public MessageMappingException(Message failedMessage, String description) { + super(failedMessage, description); + } + + public MessageMappingException(Message failedMessage, String description, Throwable cause) { + super(failedMessage, description, cause); + } + +}