From f895a5ebda5970c11e5849c878b30c424e3982c0 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 17 Jun 2010 22:39:56 +0000
Subject: [PATCH] simplified loan-broker routing now that expression supports
 bean resolution

---
 .../src/main/resources/loan-broker-config.xml | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml b/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml
index ac5fd8c6cb..a1b8bd9c23 100644
--- a/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml
+++ b/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml
@@ -21,34 +21,20 @@
 		</method>
 	</gateway>
 
-	<chain input-channel="loanBrokerPreProcessingChannel" output-channel="banksDistributionChannel">
+	<chain input-channel="loanBrokerPreProcessingChannel">
 		<header-enricher>
 			<header name="CREDIT_SCORE" ref="creditBureau" method="getCreditScore"/>
 		</header-enricher>
-		<header-enricher>
-			<header name="BANKS" ref="bankSelector" method="selectBankChannels"/>
-		</header-enricher>
+		<router expression="headers['CREDIT_SCORE'].score > 780
+								? @banks.?[value.equals('premier')].keySet()
+								: @banks.?[value.equals('secondary')].keySet()"
+				apply-sequence="true"/>
 	</chain>
 
-	<header-value-router input-channel="banksDistributionChannel" header-name="BANKS" apply-sequence="true"/>
-
 	<!-- Messages are sent to the banks via bank channels and will be received and processed by an aggregator -->
 	
 	<aggregator input-channel="quotesAggregationChannel" method="aggregateQuotes">
 		<beans:bean class="org.springframework.integration.loanbroker.LoanQuoteAggregator"/>
 	</aggregator>
 	
-	<beans:bean id="bankSelector" class="org.springframework.integration.loanbroker.BanksChannelSelector">
-		<beans:constructor-arg ref="banks"/>
-		<beans:property name="routingExpression">
-			<!-- This expression also demonstrates 'Collection Selection' concept of SpEL 
-			(see http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/expressions.html#d0e11961)
-			-->
-			<beans:value>
-				headers['CREDIT_SCORE'].score > 780 ? #banks.?[value.equals('premier')].keySet()
-													: #banks.?[value.equals('secondary')].keySet()
-			</beans:value>	
-		</beans:property>
-	</beans:bean>
-
 </beans:beans>