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

INT-3271 Revert MessageHandlingException Ctor Use

Browse Source 
When `MHE` was moved to spring-messaging, 2 constructors were
dropped. INT-3246 worked around it but it had undesirable
side-effects. Constructors have been added back in
spring-messaging so this commit reverts to using those
constructors.

JIRA: https://jira.springsource.org/browse/INT-3271
This commit is contained in:
Gary Russell
2014-01-22 16:24:07 -05:00
committed by Artem Bilan
parent 1eefab9339
commit 5cb9f05a40
10 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -59,7 +59,7 @@ subprojects { subproject ->
h2Version = '1.3.172'
activeMqVersion = '5.8.0'
springVersionDefault = '4.0.0.RELEASE'
springVersionDefault = '4.0.1.BUILD-SNAPSHOT'
springVersion = project.hasProperty('springVersion') ? getProperty('springVersion') : springVersionDefault
springAmqpVersion = '1.3.0.BUILD-SNAPSHOT'

7
spring-integration-core/src/main/java/org/springframework/integration/MessageRejectedException.java
View File

@@ -27,13 +27,8 @@ import org.springframework.messaging.MessageHandlingException;
@SuppressWarnings("serial")
public class MessageRejectedException extends MessageHandlingException {
/**
* @param failedMessage The failed message.
* @deprecated since 4.0 in favor of {@code MessageRejectedException(Message, String)}
*/
@Deprecated
public MessageRejectedException(Message<?> failedMessage) {
super(failedMessage, null);
super(failedMessage);
}
public MessageRejectedException(Message<?> failedMessage, String description) {

9
spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
View File

@@ -26,7 +26,6 @@ import org.aopalliance.aop.Advice;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.core.task.SyncTaskExecutor;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.integration.channel.MessagePublishingErrorHandler;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor;
@@ -34,6 +33,7 @@ import org.springframework.integration.transaction.IntegrationResourceHolder;
import org.springframework.integration.transaction.TransactionSynchronizationFactory;
import org.springframework.integration.util.ErrorHandlingTaskExecutor;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.support.ErrorMessage;
import org.springframework.scheduling.Trigger;
@@ -97,6 +97,7 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
this.errorHandler = errorHandler;
}
@Override
public void setBeanClassLoader(ClassLoader classLoader) {
this.beanClassLoader = classLoader;
}
@@ -140,6 +141,7 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
private Runnable createPoller() throws Exception {
Callable<Boolean> pollingTask = new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
return doPoll();
}
@@ -265,8 +267,10 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
this.pollingTask = pollingTask;
}
@Override
public void run() {
taskExecutor.execute(new Runnable() {
@Override
public void run() {
int count = 0;
while (initialized && (maxMessagesPerPoll <= 0 || count < maxMessagesPerPoll)) {
@@ -281,8 +285,7 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
throw (RuntimeException) e;
}
else {
throw new MessageHandlingException(new ErrorMessage(e),
AbstractPollingEndpoint.this.getComponentName() + " failed to invoke pollingTask.", e);
throw new MessageHandlingException(new ErrorMessage(e), e);
}
}
}

5
spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java
View File

@@ -21,9 +21,9 @@ import java.lang.reflect.Method;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.core.convert.ConversionService;
import org.springframework.integration.util.MessagingMethodInvokerHelper;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.integration.util.MessagingMethodInvokerHelper;
/**
* A MessageProcessor implementation that invokes a method on a target Object. The Method instance or method name may be
@@ -69,12 +69,13 @@ public class MethodInvokingMessageProcessor<T> extends AbstractMessageProcessor<
delegate.setBeanFactory(beanFactory);
}
@Override
public T processMessage(Message<?> message) {
try {
return delegate.process(message);
}
catch (Exception e) {
throw new MessageHandlingException(message, this.delegate + " failed to process Message.", e);
throw new MessageHandlingException(message, e);
}
}

9
spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java
View File

@@ -17,18 +17,17 @@
package org.springframework.integration.gateway;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ContextConfiguration;
@@ -71,6 +70,7 @@ public class GatewayInvokingMessageHandlerTests {
@Test
public void validateGatewayInTheChainViaChannel() {
output.subscribe(new MessageHandler() {
@Override
public void handleMessage(Message<?> message) {
Assert.assertEquals("echo:echo:echo:hello", message.getPayload());
Assert.assertEquals("foo", message.getHeaders().get("foo"));
@@ -83,6 +83,7 @@ public class GatewayInvokingMessageHandlerTests {
@Test
public void validateGatewayInTheChainViaAnotherGateway() {
output.subscribe(new MessageHandler() {
@Override
public void handleMessage(Message<?> message) {
Assert.assertEquals("echo:echo:echo:hello", message.getPayload());
Assert.assertEquals("foo", message.getHeaders().get("foo"));
@@ -178,7 +179,7 @@ public class GatewayInvokingMessageHandlerTests {
}
public String echoWithMessagingException(String value) {
throw new MessageHandlingException(new GenericMessage<String>(value), null);
throw new MessageHandlingException(new GenericMessage<String>(value));
}
public String echoWithErrorAsync(String value) {

2
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java
View File

@@ -125,7 +125,7 @@ public class TcpMessageMapper implements
bytes = ((String) payload).getBytes(this.charset);
}
catch (UnsupportedEncodingException e) {
throw new MessageHandlingException(message, null, e);
throw new MessageHandlingException(message, e);
}
}
else {

10
spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java
View File

@@ -23,15 +23,15 @@ import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.messaging.MessageHeaders;
import org.springframework.integration.ip.IpHeaders;
import org.springframework.integration.ip.util.RegexUtils;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.integration.mapping.MessageMappingException;
import org.springframework.integration.mapping.OutboundMessageMapper;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.messaging.MessageHeaders;
import org.springframework.util.Assert;
/**
@@ -101,6 +101,7 @@ public class DatagramPacketMessageMapper implements InboundMessageMapper<Datagra
/**
* Raw byte[] from message, possibly with a length field up front.
*/
@Override
public DatagramPacket fromMessage(Message<?> message) throws Exception {
if (this.acknowledge) {
return fromMessageWithAck(message);
@@ -156,7 +157,7 @@ public class DatagramPacketMessageMapper implements InboundMessageMapper<Datagra
bytes = ((String) payload).getBytes(this.charset);
}
catch (UnsupportedEncodingException e) {
throw new MessageHandlingException(message, null, e);
throw new MessageHandlingException(message, e);
}
}
else {
@@ -166,6 +167,7 @@ public class DatagramPacketMessageMapper implements InboundMessageMapper<Datagra
return bytes;
}
@Override
public Message<byte[]> toMessage(DatagramPacket packet) throws Exception {
int offset = packet.getOffset();
int length = packet.getLength();

2
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
View File

@@ -673,7 +673,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
return replyMessage;
}
catch (JMSException e) {
throw new MessageHandlingException(requestMessage, this.getComponentName() + " failed to handle request Message.", e);
throw new MessageHandlingException(requestMessage, e);
}
}

8
spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java
View File

@@ -18,13 +18,13 @@ package org.springframework.integration.rmi;
import java.io.Serializable;
import org.springframework.integration.gateway.RequestReplyExchanger;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.messaging.MessagingException;
import org.springframework.integration.gateway.RequestReplyExchanger;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.remoting.RemoteAccessException;
import org.springframework.remoting.rmi.RmiProxyFactoryBean;
@@ -65,7 +65,7 @@ public class RmiOutboundGateway extends AbstractReplyProducingMessageHandler {
return reply;
}
catch (MessagingException e) {
throw new MessageHandlingException(message, this.getComponentName() + " failed to handle request Message.", e);
throw new MessageHandlingException(message, e);
}
catch (RemoteAccessException e) {
throw new MessageHandlingException(message, "Remote failure in RmiOutboundGateway: " + this.getComponentName(), e);

2
spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java
View File

@@ -99,7 +99,7 @@ public class XmlValidatingMessageSelector implements MessageSelector {
validationExceptions = this.xmlValidator.validate(this.converter.convertToSource(message.getPayload()));
}
catch (Exception e) {
throw new MessageHandlingException(message, "XML validation error.", e);
throw new MessageHandlingException(message, e);
}
boolean validationSuccess = ObjectUtils.isEmpty(validationExceptions);
if (!validationSuccess) {