diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java deleted file mode 100644 index 6f35b88cfc..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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; - -import org.springframework.messaging.Message; -import org.springframework.messaging.MessagingException; - -/** - * Exception that indicates an error occurred during message handling. - * - * @author Mark Fisher - */ -@SuppressWarnings("serial") -public class MessageHandlingException extends MessagingException { - - public MessageHandlingException(Message failedMessage) { - super(failedMessage); - } - - public MessageHandlingException(Message failedMessage, String description) { - super(failedMessage, description); - } - - public MessageHandlingException(Message failedMessage, Throwable cause) { - super(failedMessage, cause); - } - - public MessageHandlingException(Message failedMessage, String description, Throwable cause) { - super(failedMessage, description, cause); - } - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageRejectedException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageRejectedException.java index 920a4a5d90..2a0ce3dc94 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageRejectedException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/MessageRejectedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2014 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. @@ -17,6 +17,7 @@ package org.springframework.integration; import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandlingException; /** * Exception that indicates a message has been rejected by a selector. @@ -26,8 +27,12 @@ import org.springframework.messaging.Message; @SuppressWarnings("serial") public class MessageRejectedException extends MessageHandlingException { + /** + * @deprecated since 4.0 in favor of {@code MessageRejectedException(Message, String)} + */ + @Deprecated public MessageRejectedException(Message failedMessage) { - super(failedMessage); + super(failedMessage, null); } public MessageRejectedException(Message failedMessage, String description) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java index c8079a8034..88f148bfd6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -26,7 +26,7 @@ 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.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.MessagePublishingErrorHandler; import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor; @@ -281,7 +281,8 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement throw (RuntimeException) e; } else { - throw new MessageHandlingException(new ErrorMessage(e)); + throw new MessageHandlingException(new ErrorMessage(e), + AbstractPollingEndpoint.this.getComponentName() + " failed to invoke pollingTask.", e); } } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java index e189b6ae3d..2a61e1b61c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java @@ -18,7 +18,7 @@ package org.springframework.integration.handler; import org.springframework.core.Ordered; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessagingException; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.context.Orderable; @@ -32,7 +32,7 @@ import org.springframework.util.Assert; * and error handling capabilities. Asserts that the incoming Message is not * null and that it does not contain a null payload. Converts checked exceptions * into runtime {@link MessagingException}s. - * + * * @author Mark Fisher * @author Oleg Zhurakousky */ diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java index 32c3aaa79d..8e431c1a0a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java @@ -32,7 +32,7 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.store.MessageGroup; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java index 2dbeaf11b5..4d991b82a3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java @@ -23,7 +23,7 @@ import java.util.concurrent.locks.ReentrantLock; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.Lifecycle; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.filter.MessageFilter; import org.springframework.integration.support.channel.BeanFactoryChannelResolver; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java index 71d166aebe..dba3b6b707 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2014 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. @@ -22,7 +22,7 @@ import java.lang.reflect.Method; import org.springframework.beans.factory.BeanFactory; import org.springframework.core.convert.ConversionService; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.util.MessagingMethodInvokerHelper; /** @@ -31,9 +31,10 @@ import org.springframework.integration.util.MessagingMethodInvokerHelper; * the method-selection will be dynamic, based on the underlying SpEL method resolution. Alternatively, an annotation * type may be provided so that the candidates for SpEL's method resolution are determined by the presence of that * annotation rather than the method name. - * + * * @author Dave Syer - * + * @author Artem Bilan + * * @since 2.0 */ public class MethodInvokingMessageProcessor extends AbstractMessageProcessor { @@ -55,13 +56,13 @@ public class MethodInvokingMessageProcessor extends AbstractMessageProcessor< public MethodInvokingMessageProcessor(Object targetObject, Class annotationType) { delegate = new MessagingMethodInvokerHelper(targetObject, annotationType, false); } - + @Override public void setConversionService(ConversionService conversionService) { super.setConversionService(conversionService); delegate.setConversionService(conversionService); } - + @Override public void setBeanFactory(BeanFactory beanFactory) { super.setBeanFactory(beanFactory); @@ -73,7 +74,7 @@ public class MethodInvokingMessageProcessor extends AbstractMessageProcessor< return delegate.process(message); } catch (Exception e) { - throw new MessageHandlingException(message, e); + throw new MessageHandlingException(message, this.delegate + " failed to process Message.", e); } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java index 94bc01b4e7..f49d17b759 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java @@ -19,7 +19,7 @@ package org.springframework.integration.handler; import java.lang.reflect.Method; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.annotation.ServiceActivator; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/ContentEnricher.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/ContentEnricher.java index dac3be6142..b0539cdc08 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/ContentEnricher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/ContentEnricher.java @@ -28,7 +28,7 @@ import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.expression.IntegrationEvaluationContextAware; import org.springframework.integration.gateway.MessagingGatewaySupport; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java b/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java index 6f6d0cd6dd..0dbe6b2621 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java @@ -27,7 +27,7 @@ import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.expression.ExpressionUtils; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java index a43593183e..c1489f4f45 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java @@ -50,7 +50,7 @@ import org.springframework.expression.Expression; import org.springframework.expression.TypeConverter; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java index d97a28200c..c01d847880 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.SimpleMessageStore; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java index 5ccf5e15f0..4692c0eb6c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java index 769410a459..59032e1f44 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java @@ -39,7 +39,7 @@ import org.mockito.Mock; import org.mockito.internal.stubbing.answers.ThrowsException; import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.store.SimpleMessageGroup; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java index ff398094f4..468e58d564 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2014 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. @@ -88,7 +88,7 @@ public class MixedDispatcherConfigurationScenarioTests { Mockito.reset(handlerA); Mockito.reset(handlerB); Mockito.reset(handlerC); - + ac = new ClassPathXmlApplicationContext("MixedDispatcherConfigurationScenarioTests-context.xml", MixedDispatcherConfigurationScenarioTests.class); executor = ac.getBean("taskExecutor", ExecutorService.class); @@ -100,7 +100,7 @@ public class MixedDispatcherConfigurationScenarioTests { @Test public void noFailoverNoLoadBalancing() { DirectChannel channel = (DirectChannel) ac.getBean("noLoadBalancerNoFailover"); - doThrow(new MessageRejectedException(message)).when(handlerA).handleMessage(message); + doThrow(new MessageRejectedException(message, null)).when(handlerA).handleMessage(message); UnicastingDispatcher dispatcher = channel.getDispatcher(); dispatcher.addHandler(handlerA); dispatcher.addHandler(handlerB); @@ -119,7 +119,7 @@ public class MixedDispatcherConfigurationScenarioTests { @Test(timeout = 5000) public void noFailoverNoLoadBalancingConcurrent() throws Exception { final DirectChannel channel = (DirectChannel) ac.getBean("noLoadBalancerNoFailover"); - doThrow(new MessageRejectedException(message)).when(handlerA).handleMessage(message); + doThrow(new MessageRejectedException(message, null)).when(handlerA).handleMessage(message); UnicastingDispatcher dispatcher = channel.getDispatcher(); dispatcher.addHandler(handlerA); dispatcher.addHandler(handlerB); @@ -148,10 +148,10 @@ public class MixedDispatcherConfigurationScenarioTests { } start.countDown(); allDone.await(); - + executor.shutdown(); executor.awaitTermination(5, TimeUnit.SECONDS); - + assertTrue("not all messages were accepted", failed.get()); verify(handlerA, times(TOTAL_EXECUTIONS)).handleMessage(message); verify(handlerB, times(0)).handleMessage(message); @@ -167,7 +167,7 @@ public class MixedDispatcherConfigurationScenarioTests { dispatcher.addHandler(handlerB); doAnswer(new Answer() { - public Object answer(InvocationOnMock invocation) { + public Object answer(InvocationOnMock invocation) { RuntimeException e = new RuntimeException(); allDone.countDown(); failed.set(true); @@ -175,14 +175,14 @@ public class MixedDispatcherConfigurationScenarioTests { throw e; } }).when(handlerA).handleMessage(message); - + doAnswer(new Answer() { - public Object answer(InvocationOnMock invocation) { + public Object answer(InvocationOnMock invocation) { allDone.countDown(); return null; } }).when(handlerB).handleMessage(message); - + Runnable messageSenderTask = new Runnable() { public void run() { try { @@ -201,7 +201,7 @@ public class MixedDispatcherConfigurationScenarioTests { executor.shutdown(); executor.awaitTermination(5, TimeUnit.SECONDS); - + assertTrue("not all messages were accepted", failed.get()); verify(handlerA, times(TOTAL_EXECUTIONS)).handleMessage(message); verify(handlerB, times(0)).handleMessage(message); @@ -211,7 +211,7 @@ public class MixedDispatcherConfigurationScenarioTests { @Test public void noFailoverLoadBalancing() { DirectChannel channel = (DirectChannel) ac.getBean("loadBalancerNoFailover"); - doThrow(new MessageRejectedException(message)).when(handlerA).handleMessage(message); + doThrow(new MessageRejectedException(message, null)).when(handlerA).handleMessage(message); UnicastingDispatcher dispatcher = channel.getDispatcher(); dispatcher.setLoadBalancingStrategy(new RoundRobinLoadBalancingStrategy()); dispatcher.addHandler(handlerA); @@ -242,7 +242,7 @@ public class MixedDispatcherConfigurationScenarioTests { @Test(timeout = 5000) public void noFailoverLoadBalancingConcurrent() throws Exception { final DirectChannel channel = (DirectChannel) ac.getBean("loadBalancerNoFailover"); - doThrow(new MessageRejectedException(message)).when(handlerA).handleMessage(message); + doThrow(new MessageRejectedException(message, null)).when(handlerA).handleMessage(message); UnicastingDispatcher dispatcher = channel.getDispatcher(); dispatcher.addHandler(handlerA); dispatcher.addHandler(handlerB); @@ -276,10 +276,10 @@ public class MixedDispatcherConfigurationScenarioTests { } start.countDown(); allDone.await(); - + executor.shutdown(); executor.awaitTermination(5, TimeUnit.SECONDS); - + assertTrue("not all messages were accepted", failed.get()); verify(handlerA, times(14)).handleMessage(message); verify(handlerB, times(13)).handleMessage(message); @@ -300,7 +300,7 @@ public class MixedDispatcherConfigurationScenarioTests { final Message message = this.message; final AtomicBoolean failed = new AtomicBoolean(false); doAnswer(new Answer() { - public Object answer(InvocationOnMock invocation) { + public Object answer(InvocationOnMock invocation) { failed.set(true); RuntimeException e = new RuntimeException(); exceptionRegistry.add(e); @@ -339,7 +339,7 @@ public class MixedDispatcherConfigurationScenarioTests { executor.shutdown(); executor.awaitTermination(5, TimeUnit.SECONDS); - + assertTrue("not all messages were accepted", failed.get()); verify(handlerA, times(14)).handleMessage(message); verify(handlerB, times(13)).handleMessage(message); @@ -351,7 +351,7 @@ public class MixedDispatcherConfigurationScenarioTests { public void failoverNoLoadBalancing() { DirectChannel channel = (DirectChannel) ac .getBean("noLoadBalancerFailover"); - doThrow(new MessageRejectedException(message)).when(handlerA) + doThrow(new MessageRejectedException(message, null)).when(handlerA) .handleMessage(message); UnicastingDispatcher dispatcher = channel.getDispatcher(); dispatcher.addHandler(handlerA); @@ -381,7 +381,7 @@ public class MixedDispatcherConfigurationScenarioTests { throws Exception { final DirectChannel channel = (DirectChannel) ac .getBean("noLoadBalancerFailover"); - doThrow(new MessageRejectedException(message)).when(handlerA).handleMessage(message); + doThrow(new MessageRejectedException(message, null)).when(handlerA).handleMessage(message); UnicastingDispatcher dispatcher = channel.getDispatcher(); dispatcher.addHandler(handlerA); dispatcher.addHandler(handlerB); @@ -415,44 +415,44 @@ public class MixedDispatcherConfigurationScenarioTests { } start.countDown(); allDone.await(); - + executor.shutdown(); executor.awaitTermination(5, TimeUnit.SECONDS); - + assertFalse("not all messages were accepted", failed.get()); verify(handlerA, times(TOTAL_EXECUTIONS)).handleMessage(message); verify(handlerB, times(TOTAL_EXECUTIONS)).handleMessage(message); verify(handlerC, never()).handleMessage(message); verify(exceptionRegistry, never()).add((Exception) anyObject()); } - - @Test(timeout = 5000) + + @Test(timeout = 5000) public void failoverNoLoadBalancingWithExecutorConcurrent() throws Exception { final ExecutorChannel channel = (ExecutorChannel) ac.getBean("noLoadBalancerFailoverExecutor"); - final UnicastingDispatcher dispatcher = channel.getDispatcher(); + final UnicastingDispatcher dispatcher = channel.getDispatcher(); dispatcher.addHandler(handlerA); - dispatcher.addHandler(handlerB); + dispatcher.addHandler(handlerB); dispatcher.addHandler(handlerC); - + doAnswer(new Answer() { - public Object answer(InvocationOnMock invocation) { - RuntimeException e = new RuntimeException(); + public Object answer(InvocationOnMock invocation) { + RuntimeException e = new RuntimeException(); failed.set(true); throw e; } }).when(handlerA).handleMessage(message); doAnswer(new Answer() { - public Object answer(InvocationOnMock invocation) { + public Object answer(InvocationOnMock invocation) { allDone.countDown(); return null; } }).when(handlerB).handleMessage(message); doAnswer(new Answer() { - public Object answer(InvocationOnMock invocation) { + public Object answer(InvocationOnMock invocation) { return null; } }).when(handlerC).handleMessage(message); - + Runnable messageSenderTask = new Runnable() { public void run() { try { @@ -465,14 +465,14 @@ public class MixedDispatcherConfigurationScenarioTests { }; for (int i = 0; i < TOTAL_EXECUTIONS; i++) { executor.execute(messageSenderTask); - + } - start.countDown(); + start.countDown(); allDone.await(); - + executor.shutdown(); executor.awaitTermination(5, TimeUnit.SECONDS); - + verify(handlerA, times(TOTAL_EXECUTIONS)).handleMessage(message); verify(handlerB, times(TOTAL_EXECUTIONS)).handleMessage(message); verify(handlerC, never()).handleMessage(message); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java index b106e54315..e488aed7d8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java @@ -37,7 +37,7 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.aggregator.AggregatingMessageHandler; import org.springframework.integration.aggregator.CorrelationStrategy; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java index f430cc0584..14d1ecfd30 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java @@ -17,7 +17,7 @@ package org.springframework.integration.config; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java index 80aece6298..00f5d248a4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2014 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. @@ -200,7 +200,7 @@ public class SubscriberOrderTests { if (callNumber == methodNumber) { count++; if (count >= this.maxCallsPerMethod) { - throw new MessageRejectedException(message); + throw new MessageRejectedException(message, null); } } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java index 782bddbc08..f7abf96b18 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java @@ -34,7 +34,7 @@ import org.springframework.beans.TypeMismatchException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.expression.Expression; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java index 7273d8aec5..7885cb2bc8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java @@ -27,7 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.spel.SpelEvaluationException; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java index 28f1c2239f..67ae723b97 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2009 the original author or authors. +/* Copyright 2002-2014 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. @@ -144,7 +144,7 @@ public class RoundRobinDispatcherConcurrentTests { public void noHandlerSkipUnderConcurrentFailureWithFailover() throws Exception { dispatcher.addHandler(handler1); dispatcher.addHandler(handler2); - doThrow(new MessageRejectedException(message)).when(handler1).handleMessage(message); + doThrow(new MessageRejectedException(message, null)).when(handler1).handleMessage(message); final CountDownLatch start = new CountDownLatch(1); final CountDownLatch allDone = new CountDownLatch(TOTAL_EXECUTIONS); final Message message = this.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 de7a8f6480..ce1fe87c03 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 @@ -24,7 +24,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.support.GenericMessage; @@ -178,7 +178,7 @@ public class GatewayInvokingMessageHandlerTests { } public String echoWithMessagingException(String value) { - throw new MessageHandlingException(new GenericMessage(value)); + throw new MessageHandlingException(new GenericMessage(value), null); } public String echoWithErrorAsync(String value) { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java index fbe2ca5f50..62554c8eab 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java @@ -37,7 +37,7 @@ import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.support.StaticApplicationContext; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.MessagePublishingErrorHandler; import org.springframework.integration.context.IntegrationContextUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java index d3f0b415bf..87639c6aa0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java @@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessagingException; import org.springframework.integration.annotation.Header; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java index 4c17cfb11a..93ca64200d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java @@ -39,7 +39,7 @@ import org.junit.rules.ExpectedException; import org.springframework.expression.spel.SpelEvaluationException; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.gateway.GatewayProxyFactoryBean; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java index 4a25e2edb6..e92c820031 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java @@ -54,7 +54,7 @@ import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.support.AopUtils; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.endpoint.PollingConsumer; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java index 9d32cb9d69..d1870789d5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java @@ -33,7 +33,7 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.config.ConsumerEndpointFactoryBean; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java index 211dea17ca..247d5085ea 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.messaging.Message; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java index 8cab95e989..5955027faa 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.messaging.support.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java index afc4857e08..91b73c8c82 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java @@ -33,7 +33,7 @@ import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.channel.MessagePublishingErrorHandler; import org.springframework.integration.context.IntegrationContextUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java index c07f344667..0b2b99e96c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java @@ -34,7 +34,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.NullChannel; import org.springframework.integration.channel.QueueChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java index 3fadb4f85b..31519d4408 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java @@ -25,7 +25,7 @@ import java.util.Properties; import org.junit.Test; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Transformer; import org.springframework.integration.handler.MethodInvokingMessageProcessor; diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java index 19b4910ee4..88e5bb2fd7 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java @@ -44,7 +44,7 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.GenericApplicationContext; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.messaging.PollableChannel; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java index 04d0109a26..8a7e0286ea 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java @@ -35,7 +35,7 @@ import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.file.support.FileExistsMode; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java index 9c34d5f82c..102fb3289d 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java @@ -28,7 +28,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java index fa61116a95..51d04a4030 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java @@ -37,7 +37,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.NullChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.file.support.FileExistsMode; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java index 6c64cb4521..170403cebb 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java @@ -31,7 +31,7 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.expression.Expression; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.file.DefaultFileNameGenerator; import org.springframework.integration.file.FileWritingMessageHandler; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java index da29e6134a..f22f1b2809 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java @@ -37,7 +37,7 @@ import org.springframework.beans.factory.BeanIsAbstractException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.PollableChannel; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java index 026306783c..5bdbc7199f 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java @@ -38,7 +38,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.handler.ReplyRequiredException; import org.springframework.integration.scripting.ScriptVariableGenerator; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java index 860c160743..fdfe6eb4e3 100755 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java @@ -45,7 +45,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.expression.ExpressionEvalMap; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java index fa3c640cf7..6a4969bd27 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java @@ -36,7 +36,7 @@ import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.test.util.SocketUtils; import org.springframework.messaging.Message; 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 ebd28a5741..e2647529ad 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 @@ -21,7 +21,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.springframework.context.Lifecycle; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; 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 55bafebf2e..fe7be52c7f 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,7 +21,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.integration.mapping.OutboundMessageMapper; @@ -123,7 +123,7 @@ public class TcpMessageMapper implements bytes = ((String) payload).getBytes(this.charset); } catch (UnsupportedEncodingException e) { - throw new MessageHandlingException(message, e); + throw new MessageHandlingException(message, null, e); } } else { 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 406c3e893f..928b97572e 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 @@ -24,7 +24,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessageHeaders; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.util.RegexUtils; @@ -156,7 +156,7 @@ public class DatagramPacketMessageMapper implements InboundMessageMapper message) { if (!(message.getPayload() instanceof Serializable)) { throw new MessageHandlingException(message, - this.getClass().getName() + " expects a Serializable payload type " + + this.getComponentName() + " expects a Serializable payload type " + "but encountered [" + message.getPayload().getClass().getName() + "]"); } Message requestMessage = MessageBuilder.withPayload(message.getPayload()) @@ -65,10 +65,10 @@ public class RmiOutboundGateway extends AbstractReplyProducingMessageHandler { return reply; } catch (MessagingException e) { - throw new MessageHandlingException(message, e); + throw new MessageHandlingException(message, this.getComponentName() + " failed to handle request Message.", e); } catch (RemoteAccessException e) { - throw new MessageHandlingException(message, "remote failure in RmiOutboundGateway", e); + throw new MessageHandlingException(message, "Remote failure in RmiOutboundGateway: " + this.getComponentName(), e); } } diff --git a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java index 8f0d116bb5..68af9d0528 100644 --- a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java +++ b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java @@ -28,7 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.gateway.RequestReplyExchanger; diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/AbstractScriptExecutingMessageProcessor.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/AbstractScriptExecutingMessageProcessor.java index 6fe6aec74c..68bbef905f 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/AbstractScriptExecutingMessageProcessor.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/AbstractScriptExecutingMessageProcessor.java @@ -20,7 +20,7 @@ import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.handler.MessageProcessor; import org.springframework.scripting.ScriptSource; import org.springframework.util.Assert; diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java index 4bc42d4050..2a6c665b54 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java @@ -33,7 +33,7 @@ import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.channel.MessagePublishingErrorHandler; import org.springframework.integration.context.IntegrationContextUtils; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandler.java index db877558a6..a9de44dbaa 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandler.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandler.java @@ -17,7 +17,7 @@ package org.springframework.integration.twitter.outbound; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.social.twitter.api.Tweet; import org.springframework.social.twitter.api.Twitter; diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java index f8743c30d7..24d3a57e7d 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java @@ -46,7 +46,7 @@ import org.mockito.stubbing.Answer; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java index fc6442ec14..cdfe9357b5 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.xml.sax.SAXParseException; import org.springframework.core.io.Resource; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.xml.AggregatedXmlMessageValidationException; @@ -94,7 +94,7 @@ public class XmlValidatingMessageSelector implements MessageSelector { validationExceptions = this.xmlValidator.validate(this.converter.convertToSource(message.getPayload())); } catch (Exception e) { - throw new MessageHandlingException(message, e); + throw new MessageHandlingException(message, "XML validation error.", e); } boolean validationSuccess = ObjectUtils.isEmpty(validationExceptions); if (!validationSuccess) { diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java index 1377340ebf..87dda30bf8 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java @@ -19,7 +19,7 @@ package org.springframework.integration.xmpp.outbound; import org.jivesoftware.smack.XMPPConnection; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.xmpp.XmppHeaders; import org.springframework.integration.xmpp.core.AbstractXmppConnectionAwareMessageHandler; import org.springframework.integration.xmpp.support.DefaultXmppHeaderMapper; @@ -30,7 +30,7 @@ import org.springframework.util.StringUtils; /** * MessageHandler that sends an XMPP Chat Message. Supported payload types are Smack Message * (org.jivesoftware.smack.packet.Message) or String. - * + * * @author Josh Long * @author Mario Gray * @author Oleg Zhurakousky @@ -44,7 +44,7 @@ public class ChatMessageSendingMessageHandler extends AbstractXmppConnectionAwar public ChatMessageSendingMessageHandler() { super(); } - + public ChatMessageSendingMessageHandler(XMPPConnection xmppConnection) { super(xmppConnection); } @@ -73,7 +73,7 @@ public class ChatMessageSendingMessageHandler extends AbstractXmppConnectionAwar } else { throw new MessageHandlingException(message, "Only payloads of type java.lang.String or org.jivesoftware.smack.packet.Message " + - "are supported. Received [" + messageBody.getClass().getName() + + "are supported. Received [" + messageBody.getClass().getName() + "]. Consider adding a Transformer prior to this adapter."); } if (!this.xmppConnection.isConnected()) { diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java index 5bb8b597c0..f690eabc82 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java @@ -29,7 +29,7 @@ import org.mockito.Mockito; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.messaging.Message; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandlerTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandlerTests.java index 449e9bba08..c34a9decf0 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandlerTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandlerTests.java @@ -23,7 +23,7 @@ import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.Presence; import org.junit.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.MessageHandlingException; +import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.xmpp.core.XmppContextUtils; diff --git a/src/reference/docbook/file.xml b/src/reference/docbook/file.xml index 3c18d47378..99cfd6116b 100644 --- a/src/reference/docbook/file.xml +++ b/src/reference/docbook/file.xml @@ -439,7 +439,7 @@ FAIL If the target file exists, a - MessageHandlingException + MessageHandlingException is thrown. IGNORE diff --git a/src/reference/docbook/handler-advice.xml b/src/reference/docbook/handler-advice.xml index 3756066b2e..63af9ac14a 100644 --- a/src/reference/docbook/handler-advice.xml +++ b/src/reference/docbook/handler-advice.xml @@ -359,22 +359,22 @@ Caused by: java.lang.RuntimeException: foo 05.617 DEBUG [task-scheduler-1]preSend on channel 'input', message: [Payload=...] -05.638 ERROR [task-scheduler-1]org.springframework.integration.MessageHandlingException: java.lang.RuntimeException: foo +05.638 ERROR [task-scheduler-1]org.springframework.messaging.MessageHandlingException: java.lang.RuntimeException: foo ... 10.598 DEBUG [task-scheduler-2]preSend on channel 'input', message: [Payload=...] -10.600 ERROR [task-scheduler-2]org.springframework.integration.MessageHandlingException: java.lang.RuntimeException: foo +10.600 ERROR [task-scheduler-2]org.springframework.messaging.MessageHandlingException: java.lang.RuntimeException: foo ... 15.598 DEBUG [task-scheduler-3]preSend on channel 'input', message: [Payload=...] -15.599 ERROR [task-scheduler-3]org.springframework.integration.MessagingException: Circuit Breaker is Open for ServiceActivator +15.599 ERROR [task-scheduler-3]org.springframework.messaging.MessagingException: Circuit Breaker is Open for ServiceActivator ... 20.598 DEBUG [task-scheduler-2]preSend on channel 'input', message: [Payload=...] -20.598 ERROR [task-scheduler-2]org.springframework.integration.MessagingException: Circuit Breaker is Open for ServiceActivator +20.598 ERROR [task-scheduler-2]org.springframework.messaging.MessagingException: Circuit Breaker is Open for ServiceActivator ... 25.598 DEBUG [task-scheduler-5]preSend on channel 'input', message: [Payload=...] -25.601 ERROR [task-scheduler-5]org.springframework.integration.MessageHandlingException: java.lang.RuntimeException: foo +25.601 ERROR [task-scheduler-5]org.springframework.messaging.MessageHandlingException: java.lang.RuntimeException: foo ... 30.598 DEBUG [task-scheduler-1]preSend on channel 'input', message: [Payload=foo...] -30.599 ERROR [task-scheduler-1]org.springframework.integration.MessagingException: Circuit Breaker is Open for ServiceActivator]]> +30.599 ERROR [task-scheduler-1]org.springframework.messaging.MessagingException: Circuit Breaker is Open for ServiceActivator]]> In the above example, the threshold is set to 2 and halfOpenAfter is set to 12 seconds; a new request arrives every 5 seconds. You can see that