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

Moved ConcurrentHandler into the 'endpoint' package and moved MessageDeliveryException/MessageHandlingException into the 'message' package (part of INT-112).

Browse Source
This commit is contained in:
Mark Fisher
2008-02-18 18:05:49 +00:00
parent 0b5013939e
commit 3719c32a0f
33 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-integration-core/src/main/java/org/springframework/integration/MessagingConfigurationException.java
View File

@@ -24,12 +24,12 @@ package org.springframework.integration;
@SuppressWarnings("serial")
public class MessagingConfigurationException extends MessagingException {
public MessagingConfigurationException(String message) {
super(message);
public MessagingConfigurationException(String description) {
super(description);
}
public MessagingConfigurationException(String message, Throwable cause) {
super(message, cause);
public MessagingConfigurationException(String description, Throwable cause) {
super(description, cause);
}
}

8
spring-integration-core/src/main/java/org/springframework/integration/MessagingException.java
View File

@@ -28,12 +28,12 @@ public class MessagingException extends RuntimeException {
super();
}
public MessagingException(String message) {
super(message);
public MessagingException(String description) {
super(description);
}
public MessagingException(String message, Throwable cause) {
super(message, cause);
public MessagingException(String description, Throwable cause) {
super(description, cause);
}
}

2
spring-integration-core/src/main/java/org/springframework/integration/adapter/PollingSourceAdapter.java
View File

@@ -19,8 +19,8 @@ package org.springframework.integration.adapter;
import java.util.Collection;
import org.springframework.context.Lifecycle;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.integration.message.MessageMapper;
import org.springframework.integration.scheduling.MessagingTask;
import org.springframework.integration.scheduling.MessagingTaskScheduler;

2
spring-integration-core/src/main/java/org/springframework/integration/adapter/file/AbstractFileMapper.java
View File

@@ -23,10 +23,10 @@ import java.io.FileWriter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.message.AbstractMessageMapper;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.util.Assert;
import org.springframework.util.FileCopyUtils;

2
spring-integration-core/src/main/java/org/springframework/integration/adapter/file/FileSource.java
View File

@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.adapter.PollableSource;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.util.Assert;
/**

2
spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java
View File

@@ -19,10 +19,10 @@ package org.springframework.integration.adapter.jms;
import javax.jms.JMSException;
import javax.jms.MessageListener;
import org.springframework.integration.MessageDeliveryException;
import org.springframework.integration.MessagingConfigurationException;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageDeliveryException;
import org.springframework.integration.message.MessageMapper;
import org.springframework.integration.message.SimplePayloadMessageMapper;
import org.springframework.jms.support.converter.MessageConverter;

2
spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java
View File

@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.springframework.integration.MessageDeliveryException;
import org.springframework.integration.adapter.PollableSource;
import org.springframework.integration.message.MessageDeliveryException;
/**
* A pollable source for receiving bytes from an {@link InputStream}.

2
spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTargetAdapter.java
View File

@@ -20,8 +20,8 @@ import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.adapter.AbstractTargetAdapter;
import org.springframework.integration.message.MessageHandlingException;
/**
* A target adapter that writes a byte array to an {@link OutputStream}.

2
spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java
View File

@@ -24,8 +24,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.springframework.integration.MessageDeliveryException;
import org.springframework.integration.adapter.PollableSource;
import org.springframework.integration.message.MessageDeliveryException;
/**
* A pollable source for text-based {@link InputStream InputStreams}.

2
spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapter.java
View File

@@ -21,8 +21,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.adapter.AbstractTargetAdapter;
import org.springframework.integration.message.MessageHandlingException;
/**
* A target adapter that writes to an {@link OutputStream}. String-based

2
spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java
View File

@@ -19,9 +19,9 @@ package org.springframework.integration.channel.interceptor;
import java.util.Arrays;
import java.util.List;
import org.springframework.integration.MessageDeliveryException;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageDeliveryException;
import org.springframework.integration.message.selector.MessageSelector;
/**

4
spring-integration-core/src/main/java/org/springframework/integration/dispatcher/DefaultMessageDistributor.java
View File

@@ -24,11 +24,11 @@ import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.MessageDeliveryException;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.handler.MessageHandler;
import org.springframework.integration.handler.MessageHandlerNotRunningException;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageDeliveryException;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.integration.message.selector.MessageSelectorRejectedException;
import org.springframework.util.Assert;

6
spring-integration-core/src/main/java/org/springframework/integration/handler/ConcurrentHandler.java → spring-integration-core/src/main/java/org/springframework/integration/endpoint/ConcurrentHandler.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.handler;
package org.springframework.integration.endpoint;
import java.util.concurrent.ExecutorService;
@@ -22,6 +22,10 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.integration.handler.MessageHandler;
import org.springframework.integration.handler.MessageHandlerNotRunningException;
import org.springframework.integration.handler.MessageHandlerRejectedExecutionException;
import org.springframework.integration.handler.ReplyHandler;
import org.springframework.integration.message.Message;
import org.springframework.integration.util.ErrorHandler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

3
spring-integration-core/src/main/java/org/springframework/integration/endpoint/DefaultMessageEndpoint.java
View File

@@ -28,17 +28,16 @@ import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.Lifecycle;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.MessagingConfigurationException;
import org.springframework.integration.channel.ChannelRegistry;
import org.springframework.integration.channel.ChannelRegistryAware;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.handler.ConcurrentHandler;
import org.springframework.integration.handler.MessageHandler;
import org.springframework.integration.handler.MessageHandlerNotRunningException;
import org.springframework.integration.handler.MessageHandlerRejectedExecutionException;
import org.springframework.integration.handler.ReplyHandler;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.integration.message.MessageHeader;
import org.springframework.integration.message.selector.MessageSelector;
import org.springframework.integration.message.selector.MessageSelectorRejectedException;

2
spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerNotRunningException.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.handler;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.message.MessageHandlingException;
/**
* An exception indicating that a handler is not currently running.

2
spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.handler;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.message.MessageHandlingException;
/**
* An exception indicating that a message was rejected by a handler; typically

4
spring-integration-core/src/main/java/org/springframework/integration/MessageDeliveryException.java → spring-integration-core/src/main/java/org/springframework/integration/message/MessageDeliveryException.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.springframework.integration;
package org.springframework.integration.message;
import org.springframework.integration.message.Message;
import org.springframework.integration.MessagingException;
/**
* Exception that indicates an error during message delivery.

4
spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java → spring-integration-core/src/main/java/org/springframework/integration/message/MessageHandlingException.java
View File

@@ -14,7 +14,9 @@
* limitations under the License.
*/
package org.springframework.integration;
package org.springframework.integration.message;
import org.springframework.integration.MessagingException;
/**
* Exception that indicates an error during message handling.

2
spring-integration-core/src/main/java/org/springframework/integration/message/selector/MessageSelectorRejectedException.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.message.selector;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.message.MessageHandlingException;
/**
* An exception indicating that a message was rejected by an implementation of

2
spring-integration-core/src/main/java/org/springframework/integration/router/AbstractRoutingMessageHandler.java
View File

@@ -22,13 +22,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.MessagingConfigurationException;
import org.springframework.integration.channel.ChannelRegistry;
import org.springframework.integration.channel.ChannelRegistryAware;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.handler.MessageHandler;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageHandlingException;
/**
* Base class for message router implementations.

2
spring-integration-core/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java
View File

@@ -18,9 +18,9 @@ package org.springframework.integration.router;
import java.util.concurrent.ConcurrentHashMap;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.handler.MessageHandler;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.util.Assert;
/**

2
spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java
View File

@@ -20,7 +20,6 @@ import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Map;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.MessagingConfigurationException;
import org.springframework.integration.annotation.Router;
import org.springframework.integration.channel.ChannelRegistry;
@@ -28,6 +27,7 @@ import org.springframework.integration.channel.ChannelRegistryAware;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.handler.AbstractMessageHandlerAdapter;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.integration.util.SimpleMethodInvoker;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;

6
spring-integration-core/src/main/java/org/springframework/integration/util/SimpleMethodInvoker.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.util;
import java.lang.reflect.InvocationTargetException;
import org.springframework.integration.MessageDeliveryException;
import org.springframework.integration.MessagingException;
import org.springframework.util.Assert;
import org.springframework.util.MethodInvoker;
import org.springframework.util.ObjectUtils;
@@ -62,11 +62,11 @@ public class SimpleMethodInvoker<T> {
return methodInvoker.invoke();
}
catch (InvocationTargetException e) {
throw new MessageDeliveryException(
throw new MessagingException(
"Method '" + this.method + "' threw exception", e.getTargetException());
}
catch (Throwable e) {
throw new MessageDeliveryException("Failed to invoke method '" + this.method +
throw new MessagingException("Failed to invoke method '" + this.method +
"' with arguments " + ObjectUtils.nullSafeToString(args), e);
}
}