From ec91ae8f0882db0a4bb25a1d94c0dda6e437cb1e Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 10 Oct 2008 23:58:27 +0000 Subject: [PATCH] Renamed RootCauseErrorMessageRouter to the more appropriate ErrorMessageExceptionTypeRouter (the routing is actually based on the most-specific Exception type available in the exceptionTypeChannelMap). --- ...java => ErrorMessageExceptionTypeRouter.java} | 2 +- ...=> ErrorMessageExceptionTypeRouterTests.java} | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) rename org.springframework.integration/src/main/java/org/springframework/integration/router/{RootCauseErrorMessageRouter.java => ErrorMessageExceptionTypeRouter.java} (96%) rename org.springframework.integration/src/test/java/org/springframework/integration/router/{RootCauseErrorMessageRouterTests.java => ErrorMessageExceptionTypeRouterTests.java} (93%) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/RootCauseErrorMessageRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java similarity index 96% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/RootCauseErrorMessageRouter.java rename to org.springframework.integration/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java index 960c9cc00c..5decb75bac 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/RootCauseErrorMessageRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java @@ -30,7 +30,7 @@ import org.springframework.util.Assert; * * @author Mark Fisher */ -public class RootCauseErrorMessageRouter extends AbstractSingleChannelRouter { +public class ErrorMessageExceptionTypeRouter extends AbstractSingleChannelRouter { private volatile Map, MessageChannel> exceptionTypeChannelMap = new ConcurrentHashMap, MessageChannel>(); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/RootCauseErrorMessageRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java similarity index 93% rename from org.springframework.integration/src/test/java/org/springframework/integration/router/RootCauseErrorMessageRouterTests.java rename to org.springframework.integration/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java index 28ebd75207..d1b6930c93 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/RootCauseErrorMessageRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java @@ -36,7 +36,7 @@ import org.springframework.integration.message.StringMessage; /** * @author Mark Fisher */ -public class RootCauseErrorMessageRouterTests { +public class ErrorMessageExceptionTypeRouterTests { private QueueChannel illegalArgumentChannel = new QueueChannel(); @@ -56,7 +56,7 @@ public class RootCauseErrorMessageRouterTests { RuntimeException middleCause = new RuntimeException(rootCause); MessageHandlingException error = new MessageHandlingException(failedMessage, "failed", middleCause); ErrorMessage message = new ErrorMessage(error); - RootCauseErrorMessageRouter router = new RootCauseErrorMessageRouter(); + ErrorMessageExceptionTypeRouter router = new ErrorMessageExceptionTypeRouter(); Map, MessageChannel> exceptionTypeChannelMap = new HashMap, MessageChannel>(); exceptionTypeChannelMap.put(IllegalArgumentException.class, illegalArgumentChannel); @@ -78,7 +78,7 @@ public class RootCauseErrorMessageRouterTests { RuntimeException middleCause = new RuntimeException(rootCause); MessageHandlingException error = new MessageHandlingException(failedMessage, "failed", middleCause); ErrorMessage message = new ErrorMessage(error); - RootCauseErrorMessageRouter router = new RootCauseErrorMessageRouter(); + ErrorMessageExceptionTypeRouter router = new ErrorMessageExceptionTypeRouter(); Map, MessageChannel> exceptionTypeChannelMap = new HashMap, MessageChannel>(); exceptionTypeChannelMap.put(RuntimeException.class, runtimeExceptionChannel); @@ -99,7 +99,7 @@ public class RootCauseErrorMessageRouterTests { RuntimeException middleCause = new RuntimeException(rootCause); MessageHandlingException error = new MessageHandlingException(failedMessage, "failed", middleCause); ErrorMessage message = new ErrorMessage(error); - RootCauseErrorMessageRouter router = new RootCauseErrorMessageRouter(); + ErrorMessageExceptionTypeRouter router = new ErrorMessageExceptionTypeRouter(); Map, MessageChannel> exceptionTypeChannelMap = new HashMap, MessageChannel>(); exceptionTypeChannelMap.put(MessageHandlingException.class, messageHandlingExceptionChannel); @@ -119,7 +119,7 @@ public class RootCauseErrorMessageRouterTests { RuntimeException middleCause = new RuntimeException(rootCause); MessageHandlingException error = new MessageHandlingException(failedMessage, "failed", middleCause); ErrorMessage message = new ErrorMessage(error); - RootCauseErrorMessageRouter router = new RootCauseErrorMessageRouter(); + ErrorMessageExceptionTypeRouter router = new ErrorMessageExceptionTypeRouter(); router.setDefaultOutputChannel(defaultChannel); router.onMessage(message); assertNotNull(defaultChannel.receive(1000)); @@ -135,7 +135,7 @@ public class RootCauseErrorMessageRouterTests { RuntimeException middleCause = new RuntimeException(rootCause); MessageHandlingException error = new MessageHandlingException(failedMessage, "failed", middleCause); ErrorMessage message = new ErrorMessage(error); - RootCauseErrorMessageRouter router = new RootCauseErrorMessageRouter(); + ErrorMessageExceptionTypeRouter router = new ErrorMessageExceptionTypeRouter(); Map, MessageChannel> exceptionTypeChannelMap = new HashMap, MessageChannel>(); exceptionTypeChannelMap.put(MessageDeliveryException.class, messageDeliveryExceptionChannel); @@ -151,7 +151,7 @@ public class RootCauseErrorMessageRouterTests { RuntimeException middleCause = new RuntimeException(rootCause); MessageHandlingException error = new MessageHandlingException(failedMessage, "failed", middleCause); Message message = new GenericMessage(error); - RootCauseErrorMessageRouter router = new RootCauseErrorMessageRouter(); + ErrorMessageExceptionTypeRouter router = new ErrorMessageExceptionTypeRouter(); Map, MessageChannel> exceptionTypeChannelMap = new HashMap, MessageChannel>(); exceptionTypeChannelMap.put(IllegalArgumentException.class, illegalArgumentChannel); @@ -173,7 +173,7 @@ public class RootCauseErrorMessageRouterTests { RuntimeException middleCause = new RuntimeException(rootCause); MessageHandlingException error = new MessageHandlingException(failedMessage, "failed", middleCause); ErrorMessage message = new ErrorMessage(error); - RootCauseErrorMessageRouter router = new RootCauseErrorMessageRouter(); + ErrorMessageExceptionTypeRouter router = new ErrorMessageExceptionTypeRouter(); Map, MessageChannel> exceptionTypeChannelMap = new HashMap, MessageChannel>(); exceptionTypeChannelMap.put(IllegalArgumentException.class, illegalArgumentChannel);