From 33888a1fafa08a603cf6c42d99b86b8cad38d5cd Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 15 Oct 2010 18:02:40 -0400
Subject: [PATCH] INT-1489 added Orderable interface so that setOrder() can be
 invoked without downcasting to a concrete type

---
 .../AbstractMessageHandlerFactoryBean.java    |  6 ++--
 ...AbstractMethodAnnotationPostProcessor.java |  6 ++--
 .../integration/context/Orderable.java        | 36 +++++++++++++++++++
 .../handler/AbstractMessageHandler.java       |  3 +-
 4 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 spring-integration-core/src/main/java/org/springframework/integration/context/Orderable.java

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java
index c1fa40d743..b046bc13ee 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java
@@ -29,9 +29,9 @@ import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.SpelParserConfiguration;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.integration.MessageChannel;
+import org.springframework.integration.context.Orderable;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.core.MessageProducer;
-import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.integration.handler.MessageProcessor;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -108,8 +108,8 @@ abstract class AbstractMessageHandlerFactoryBean implements FactoryBean<MessageH
 			if (this.handler instanceof BeanFactoryAware) {
 				((BeanFactoryAware) this.handler).setBeanFactory(beanFactory);
 			}
-			if (this.handler instanceof AbstractMessageHandler && this.order != null) {
-				((AbstractMessageHandler) this.handler).setOrder(this.order.intValue());
+			if (this.handler instanceof Orderable && this.order != null) {
+				((Orderable) this.handler).setOrder(this.order.intValue());
 			}
 		}
 		return this.handler;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
index 4907528a31..140d60cc09 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
@@ -26,11 +26,11 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.Order;
 import org.springframework.integration.MessageChannel;
+import org.springframework.integration.context.Orderable;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.core.SubscribableChannel;
 import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
-import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
 import org.springframework.integration.support.channel.ChannelResolver;
 import org.springframework.util.Assert;
@@ -60,10 +60,10 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 
 	public Object postProcess(Object bean, String beanName, Method method, T annotation) {
 		MessageHandler handler = this.createHandler(bean, method, annotation);
-		if (handler instanceof AbstractMessageHandler) {
+		if (handler instanceof Orderable) {
 			Order orderAnnotation = AnnotationUtils.findAnnotation(method, Order.class);
 			if (orderAnnotation != null) {
-				((AbstractMessageHandler) handler).setOrder(orderAnnotation.value());
+				((Orderable) handler).setOrder(orderAnnotation.value());
 			}
 		}
 		if (beanFactory instanceof ConfigurableListableBeanFactory) {
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/Orderable.java b/spring-integration-core/src/main/java/org/springframework/integration/context/Orderable.java
new file mode 100644
index 0000000000..a632036109
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/context/Orderable.java
@@ -0,0 +1,36 @@
+/*
+ * 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.context;
+
+import org.springframework.core.Ordered;
+
+/**
+ * Interface that extends {@link Ordered} while also exposing the
+ * {@link #setOrder(int)} as an interface-level so that it is avaiable
+ * on AOP proxies, etc.
+ * 
+ * @author Mark Fisher
+ * @since 2.0
+ */
+public interface Orderable extends Ordered {
+
+	/**
+	 * Set the order for this component.
+	 */
+	void setOrder(int order);
+
+}
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 d119944281..8913ef5bf4 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
@@ -24,6 +24,7 @@ import org.springframework.integration.Message;
 import org.springframework.integration.MessageHandlingException;
 import org.springframework.integration.MessagingException;
 import org.springframework.integration.context.IntegrationObjectSupport;
+import org.springframework.integration.context.Orderable;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.history.MessageHistory;
 import org.springframework.integration.history.TrackableComponent;
@@ -38,7 +39,7 @@ import org.springframework.util.Assert;
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  */
-public abstract class AbstractMessageHandler extends IntegrationObjectSupport implements MessageHandler, TrackableComponent, Ordered {
+public abstract class AbstractMessageHandler extends IntegrationObjectSupport implements MessageHandler, TrackableComponent, Orderable {
 
 	protected final Log logger = LogFactory.getLog(this.getClass());