From f07c7fc2fdafdbe0119146c21a7462069a73d34b Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 22 Sep 2008 22:28:18 +0000 Subject: [PATCH] Removed MessageHandlerRejectedExecutionException as it is no longer used, and moved MessageListMethodAdapter to the 'aggregator' package since that is the only place it is used (and it may be refactored away). --- .../aggregator/CompletionStrategyAdapter.java | 1 - .../MessageListMethodAdapter.java | 2 +- .../aggregator/MethodInvokingAggregator.java | 1 - ...sageHandlerRejectedExecutionException.java | 39 ------------------- .../integration/handler/TestHandlers.java | 24 ------------ 5 files changed, 1 insertion(+), 66 deletions(-) rename org.springframework.integration/src/main/java/org/springframework/integration/{handler => aggregator}/MessageListMethodAdapter.java (98%) delete mode 100644 org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java index 3814637b20..d48a911e9e 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java @@ -20,7 +20,6 @@ import java.lang.reflect.Method; import java.util.List; import org.springframework.integration.ConfigurationException; -import org.springframework.integration.handler.MessageListMethodAdapter; import org.springframework.integration.message.Message; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageListMethodAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageListMethodAdapter.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java index 8a3278fc63..e816a88ca6 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageListMethodAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.handler; +package org.springframework.integration.aggregator; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MethodInvokingAggregator.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MethodInvokingAggregator.java index 2532362823..f032fd12a3 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MethodInvokingAggregator.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MethodInvokingAggregator.java @@ -19,7 +19,6 @@ package org.springframework.integration.aggregator; import java.lang.reflect.Method; import java.util.List; -import org.springframework.integration.handler.MessageListMethodAdapter; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; import org.springframework.util.CollectionUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java deleted file mode 100644 index 91c0f7b7f9..0000000000 --- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2008 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.handler; - -import org.springframework.integration.message.Message; -import org.springframework.integration.message.MessageHandlingException; - -/** - * An exception indicating that a message was rejected by a handler; typically - * this would be the result of a thread pool executor rejecting a handler task. - * - * @author Mark Fisher - */ -@SuppressWarnings("serial") -public class MessageHandlerRejectedExecutionException extends MessageHandlingException { - - public MessageHandlerRejectedExecutionException(Message message) { - super(message); - } - - public MessageHandlerRejectedExecutionException(Message message, Throwable cause) { - super(message, "handler rejected execution", cause); - } - -} diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestHandlers.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestHandlers.java index dafd93aed2..07e112c454 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestHandlers.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestHandlers.java @@ -51,30 +51,6 @@ public abstract class TestHandlers { }; } - /** - * Create a handler that throws a {@link MessageHandlerRejectedExecutionException}. - */ - public final static Object rejectingHandler() { - return new Object() { - public Message handle(Message message) { - throw new MessageHandlerRejectedExecutionException(message); - } - }; - } - - /** - * Create a handler that counts down on the provided latch and - * then throws a {@link MessageHandlerRejectedExecutionException}. - */ - public final static Object rejectingCountDownHandler(final CountDownLatch latch) { - return new Object() { - public Message handle(Message message) { - latch.countDown(); - throw new MessageHandlerRejectedExecutionException(message); - } - }; - } - /** * Create a handler that increments the provided counter. */