From 2d9f01464bba95699207ece3700e3620527cb02c Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@gopivotal.com>
Date: Thu, 17 Apr 2014 14:22:07 +0300
Subject: [PATCH] Replace `LiteralExpression` to `ValueExpression`

---
 .../integration/dsl/AbstractRouterSpec.java   |  1 +
 .../dsl/CorrelationHandlerSpec.java           |  4 ++--
 .../integration/dsl/EnricherSpec.java         |  8 +++----
 .../integration/dsl/HeaderEnricherSpec.java   | 22 ++++++-------------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/AbstractRouterSpec.java b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/AbstractRouterSpec.java
index aade96c..3969f15 100644
--- a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/AbstractRouterSpec.java
+++ b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/AbstractRouterSpec.java
@@ -53,4 +53,5 @@ public class AbstractRouterSpec<S extends AbstractRouterSpec<S, R>, R extends Ab
 	protected R doGet() {
 		throw new UnsupportedOperationException();
 	}
+
 }
diff --git a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/CorrelationHandlerSpec.java b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/CorrelationHandlerSpec.java
index 04886cb..d56e712 100644
--- a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/CorrelationHandlerSpec.java
+++ b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/CorrelationHandlerSpec.java
@@ -17,7 +17,6 @@
 package org.springframework.integration.dsl;
 
 import org.springframework.expression.Expression;
-import org.springframework.expression.common.LiteralExpression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.integration.aggregator.AbstractCorrelatingMessageHandler;
 import org.springframework.integration.aggregator.CorrelationStrategy;
@@ -27,6 +26,7 @@ import org.springframework.integration.aggregator.ReleaseStrategy;
 import org.springframework.integration.config.CorrelationStrategyFactoryBean;
 import org.springframework.integration.config.ReleaseStrategyFactoryBean;
 import org.springframework.integration.dsl.core.IntegrationComponentSpec;
+import org.springframework.integration.expression.ValueExpression;
 import org.springframework.integration.store.MessageGroupStore;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.scheduling.TaskScheduler;
@@ -73,7 +73,7 @@ public abstract class CorrelationHandlerSpec<S extends CorrelationHandlerSpec<S,
 	}
 
 	public S groupTimeout(long groupTimeout) {
-		this.groupTimeoutExpression = new LiteralExpression("" + groupTimeout);
+		this.groupTimeoutExpression = new ValueExpression<Long>(groupTimeout);
 		return _this();
 	}
 
diff --git a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/EnricherSpec.java b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/EnricherSpec.java
index fde016f..f75d561 100644
--- a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/EnricherSpec.java
+++ b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/EnricherSpec.java
@@ -98,12 +98,12 @@ public class EnricherSpec extends IntegrationComponentSpec<EnricherSpec, Content
 		return _this();
 	}
 
-	public EnricherSpec header(String name, Object value) {
+	public <V> EnricherSpec header(String name, V value) {
 		return this.header(name, value, null);
 	}
 
-	public EnricherSpec header(String name, Object value, Boolean overwrite) {
-		AbstractHeaderValueMessageProcessor<?> headerValueMessageProcessor = new StaticHeaderValueMessageProcessor<Object>(value);
+	public <V> EnricherSpec header(String name, V value, Boolean overwrite) {
+		AbstractHeaderValueMessageProcessor<V> headerValueMessageProcessor = new StaticHeaderValueMessageProcessor<V>(value);
 		headerValueMessageProcessor.setOverwrite(overwrite);
 		return this.header(name, headerValueMessageProcessor);
 	}
@@ -119,7 +119,7 @@ public class EnricherSpec extends IntegrationComponentSpec<EnricherSpec, Content
 		return this.header(name, headerValueMessageProcessor);
 	}
 
-	public EnricherSpec header(String name, HeaderValueMessageProcessor<?> headerValueMessageProcessor) {
+	public <V> EnricherSpec header(String name, HeaderValueMessageProcessor<V> headerValueMessageProcessor) {
 		Assert.notNull(name);
 		this.headerExpressions.put(name, headerValueMessageProcessor);
 		return _this();
diff --git a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/HeaderEnricherSpec.java b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/HeaderEnricherSpec.java
index 29d1ef2..0ac51ab 100644
--- a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/HeaderEnricherSpec.java
+++ b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/HeaderEnricherSpec.java
@@ -69,36 +69,28 @@ public class HeaderEnricherSpec extends IntegrationComponentSpec<HeaderEnricherS
 		return this.messageProcessor(new BeanNameMessageProcessor<Object>(beanName, methodName));
 	}
 
-	public HeaderEnricherSpec header(String name, Object value) {
+	public <V> HeaderEnricherSpec header(String name, V value) {
 		return this.header(name, value, null);
 	}
 
-	public HeaderEnricherSpec header(String name, Object value, Boolean overwrite) {
-		AbstractHeaderValueMessageProcessor<?> headerValueMessageProcessor = new StaticHeaderValueMessageProcessor<Object>(value);
+	public <V> HeaderEnricherSpec header(String name, V value, Boolean overwrite) {
+		AbstractHeaderValueMessageProcessor<V> headerValueMessageProcessor = new StaticHeaderValueMessageProcessor<V>(value);
 		headerValueMessageProcessor.setOverwrite(overwrite);
 		return this.header(name, headerValueMessageProcessor);
 	}
 
 	public HeaderEnricherSpec headerExpression(String name, String expression) {
-		return this.headerExpression(name, expression, null, null);
+		return this.headerExpression(name, expression, null);
 	}
 
 	public HeaderEnricherSpec headerExpression(String name, String expression, Boolean overwrite) {
-		return this.headerExpression(name, expression, overwrite, null);
-	}
-
-	public <T> HeaderEnricherSpec headerExpression(String name, String expression, Class<T> type) {
-		return this.headerExpression(name, expression, null, type);
-	}
-
-	public <T> HeaderEnricherSpec headerExpression(String name, String expression, Boolean overwrite, Class<T> type) {
-		AbstractHeaderValueMessageProcessor<T> headerValueMessageProcessor =
-				new ExpressionEvaluatingHeaderValueMessageProcessor<T>(expression, type);
+		AbstractHeaderValueMessageProcessor<?> headerValueMessageProcessor =
+				new ExpressionEvaluatingHeaderValueMessageProcessor<Object>(expression, null);
 		headerValueMessageProcessor.setOverwrite(overwrite);
 		return this.header(name, headerValueMessageProcessor);
 	}
 
-	public HeaderEnricherSpec header(String name, HeaderValueMessageProcessor<?> headerValueMessageProcessor) {
+	public <V> HeaderEnricherSpec header(String name, HeaderValueMessageProcessor<V> headerValueMessageProcessor) {
 		Assert.notNull(name);
 		this.headerToAdd.put(name, headerValueMessageProcessor);
 		return _this();